diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-12-04 22:31:30 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-12-04 22:31:30 +0300 |
| commit | baf89af0f5fedf0d693a9a74e690b3ca7d8ff292 (patch) | |
| tree | 22992b7f2d519c31dfa644cac58bd6cf6a5945c9 /source/blender/collada | |
| parent | 5c3955452b0e93c3977afbb3294a19d8b20d8aea (diff) | |
| parent | 22bba02bc8109f392fce50a24a4825390bca1bda (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 | ||||
| -rw-r--r-- | source/blender/collada/DocumentImporter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 3df47b71598..8c43dffdea0 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -1151,7 +1151,7 @@ bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animat #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 == Fetching_Controller_data) return true; diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index 374c184d4bc..3da962148bc 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 DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *animationClip); #endif bool writeGeometry(const COLLADAFW::Geometry*); |