diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-12-06 00:05:19 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-12-06 00:05:19 +0300 |
| commit | d6454a15f709a3f0eea62ec96a9e8929d85a4811 (patch) | |
| tree | 3a0f1a5ebf7d0636d88192f2fe48379471ecfc0e /source/blender/collada | |
| parent | 5584cad5d90ec56febaca96e6ea1326c15523fa4 (diff) | |
| parent | 3552731551ef1845b493ffebf78be5a42527e9f2 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 | ||||
| -rw-r--r-- | source/blender/collada/DocumentImporter.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 95edcff0555..8c2339497bf 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -24,8 +24,7 @@ # ***** END GPL LICENSE BLOCK ***** remove_strict_flags() - -FIND_FILE(_opencollada_with_animation_clip +FIND_FILE(OPENCOLLADA_ANIMATION_CLIP NAMES COLLADAFWAnimationClip.h PATHS @@ -33,8 +32,11 @@ FIND_FILE(_opencollada_with_animation_clip NO_DEFAULT_PATH ) -IF(_opencollada_with_animation_clip) - add_compile_definitions(OPENCOLLADA_WITH_ANIMATION_CLIP) +IF(OPENCOLLADA_ANIMATION_CLIP) + message(STATUS "Found opencollada: ${OPENCOLLADA_ANIMATION_CLIP} ") + add_definitions(-DWITH_OPENCOLLADA_ANIMATION_CLIP) +ELSE() + message(STATUS "opencollada: Build without animation clip support") ENDIF() set(INC diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 8c43dffdea0..afd50c1709b 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -1148,7 +1148,7 @@ bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animat return anim_importer.write_animation_list(animationList); } -#if OPENCOLLADA_WITH_ANIMATION_CLIP +#if WITH_OPENCOLLADA_ANIMATION_CLIP // Since opencollada 1.6.68 // called on post-process stage after writeVisualScenes bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *animationClip) diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index d0dc4bd5568..58aed43600f 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -105,7 +105,7 @@ public: bool writeAnimationList(const COLLADAFW::AnimationList*); -#if OPENCOLLADA_WITH_ANIMATION_CLIP +#if WITH_OPENCOLLADA_ANIMATION_CLIP // Please enable this when building with Collada 1.6.65 or newer (also in DocumentImporter.cpp) bool writeAnimationClip(const COLLADAFW::AnimationClip *animationClip); #endif |