[Bf-blender-cvs] [5c3955452b0] blender2.8: Merge branch 'master' into blender2.8

[Gaia Clary]

Commit: 5c3955452b0e93c3977afbb3294a19d8b20d8aea
Author: Gaia Clary
Date:   Tue Dec 4 19:48:21 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB5c3955452b0e93c3977afbb3294a19d8b20d8aea

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/collada/DocumentImporter.cpp
index 8eb9e5c969e,24b7fc4317d..3df47b71598
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@@ -1148,6 -1349,19 +1148,19 @@@ bool DocumentImporter::writeAnimationLi
  	return anim_importer.write_animation_list(animationList);
  }
  
+ #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 != General)
++	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)