diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-12-05 22:30:46 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-12-05 22:30:46 +0300 |
| commit | f692886164630f9599183151481712a40de8fa45 (patch) | |
| tree | e6a43be9631ea531baac609cff9c6b82ca7d1e31 /source/blender/collada | |
| parent | 9b228e465f1381782d52eb9f015c9c3eb2e528f5 (diff) | |
| parent | da4991fcaebc12b2b5b61eaa15189617eeb792fd (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentImporter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index 3da962148bc..d0dc4bd5568 100644 --- 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*); |