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

2018-12-05 20:30:46 +01:00
parent 9b228e465f da4991fcae
commit f692886164
1 changed files with 1 additions and 1 deletions
--- a/source/blender/collada/DocumentImporter.h
+++ b/source/blender/collada/DocumentImporter.h
@@ -107,7 +107,7 @@ public:

 #if OPENCOLLADA_WITH_ANIMATION_CLIP
 	// Please enable this when building with Collada 1.6.65 or newer (also in DocumentImporter.cpp)
-	bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *animationClip);
+	bool writeAnimationClip(const COLLADAFW::AnimationClip *animationClip);
 #endif

 	bool writeGeometry(const COLLADAFW::Geometry*);