[Bf-blender-cvs] [baf89af0f5f] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Gaia Clary]

Commit: baf89af0f5fedf0d693a9a74e690b3ca7d8ff292
Author: Gaia Clary
Date:   Tue Dec 4 20:31:30 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBbaf89af0f5fedf0d693a9a74e690b3ca7d8ff292

Merge remote-tracking branch 'origin/master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/collada/DocumentImporter.cpp
index 3df47b71598,7f93dd4823f..8c43dffdea0
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@@ -1151,9 -1352,9 +1151,9 @@@ bool DocumentImporter::writeAnimationLi
  #if OPENCOLLADA_WITH_ANIMATION_CLIP
  // Since opencollada 1.6.68
  // called on post-process stage after writeVisualScenes
- bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip)
+ bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *animationClip)
  {
 -	if (mImportStage != General)
 +	if (mImportStage == Fetching_Controller_data)
  		return true;
  
  	return true;