Merge branch 'master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 4 Dec 2018 18:48:21 +0000 (19:48 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 4 Dec 2018 18:48:21 +0000 (19:48 +0100)
1  2 
intern/ghost/intern/GHOST_ContextCGL.mm
source/blender/collada/CMakeLists.txt
source/blender/collada/DocumentImporter.cpp
source/blender/collada/DocumentImporter.h

Simple merge
@@@ -1148,6 -1349,19 +1148,19 @@@ bool DocumentImporter::writeAnimationLi
        return anim_importer.write_animation_list(animationList);
  }
  
 -      if (mImportStage != General)
+ #if OPENCOLLADA_WITH_ANIMATION_CLIP
+ // Since opencollada 1.6.68
+ // called on post-process stage after writeVisualScenes
+ bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip)
+ {
++      if (mImportStage == Fetching_Controller_data)
+               return true;
+       return true;
+       //return animation_clip_importer.write_animation_clip(animationClip); // TODO: implement import of AnimationClips
+ }
+ #endif
  /** When this method is called, the writer must write the skin controller data.
   * \return The writer should return true, if writing succeeded, false otherwise.*/
  bool DocumentImporter::writeSkinControllerData(const COLLADAFW::SkinControllerData *skin)