Merge remote-tracking branch 'origin/master' into blender2.8
This commit is contained in:
commit
d6454a15f7
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue