Merge branch 'master' into blender2.8
This commit is contained in:
commit
5c3955452b
|
@ -143,7 +143,7 @@ GHOST_TSuccess GHOST_ContextCGL::getSwapInterval(int &intervalOut)
|
|||
|
||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||
|
||||
[m_openGLContext setValues:&interval forParameter:NSOpenGLCPSwapInterval];
|
||||
[m_openGLContext getValues:&interval forParameter:NSOpenGLCPSwapInterval];
|
||||
|
||||
[pool drain];
|
||||
|
||||
|
|
|
@ -25,6 +25,18 @@
|
|||
|
||||
remove_strict_flags()
|
||||
|
||||
FIND_FILE(_opencollada_with_animation_clip
|
||||
NAMES
|
||||
COLLADAFWAnimationClip.h
|
||||
PATHS
|
||||
${OPENCOLLADA_INCLUDE_DIRS}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
IF(_opencollada_with_animation_clip)
|
||||
add_compile_definitions(OPENCOLLADA_WITH_ANIMATION_CLIP)
|
||||
ENDIF()
|
||||
|
||||
set(INC
|
||||
.
|
||||
../blenkernel
|
||||
|
|
|
@ -1148,6 +1148,19 @@ bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animat
|
|||
return anim_importer.write_animation_list(animationList);
|
||||
}
|
||||
|
||||
#if OPENCOLLADA_WITH_ANIMATION_CLIP
|
||||
// Since opencollada 1.6.68
|
||||
// called on post-process stage after writeVisualScenes
|
||||
bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip)
|
||||
{
|
||||
if (mImportStage == Fetching_Controller_data)
|
||||
return true;
|
||||
|
||||
return true;
|
||||
//return animation_clip_importer.write_animation_clip(animationClip); // TODO: implement import of AnimationClips
|
||||
}
|
||||
#endif
|
||||
|
||||
/** When this method is called, the writer must write the skin controller data.
|
||||
* \return The writer should return true, if writing succeeded, false otherwise.*/
|
||||
bool DocumentImporter::writeSkinControllerData(const COLLADAFW::SkinControllerData *skin)
|
||||
|
|
|
@ -49,8 +49,6 @@
|
|||
#include "MeshImporter.h"
|
||||
#include "ImportSettings.h"
|
||||
|
||||
|
||||
|
||||
struct bContext;
|
||||
|
||||
/** Importer class. */
|
||||
|
@ -107,6 +105,11 @@ public:
|
|||
|
||||
bool writeAnimationList(const COLLADAFW::AnimationList*);
|
||||
|
||||
#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);
|
||||
#endif
|
||||
|
||||
bool writeGeometry(const COLLADAFW::Geometry*);
|
||||
|
||||
bool writeMaterial(const COLLADAFW::Material*);
|
||||
|
|
Loading…
Reference in New Issue