Merge remote-tracking branch 'origin/master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 4 Dec 2018 19:31:30 +0000 (20:31 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 4 Dec 2018 19:31:30 +0000 (20:31 +0100)
1  2 
source/blender/collada/DocumentImporter.cpp
source/blender/collada/DocumentImporter.h

index 3df47b71598856f67e56e54017b2f7b05309eccb,7f93dd4823f5b622bdf361bdfd1020df6765a3fc..8c43dffdea00a6bc03eeb38b8120398b32bfdda5
@@@ -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;