forked from bartvdbraak/blender
rename WholeCharacter in C too, add pthreads include back for msvc which needs it.
This commit is contained in:
parent
458600d692
commit
6e2cff8c9f
@ -1001,6 +1001,9 @@ elseif(WIN32)
|
|||||||
|
|
||||||
set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
|
set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
|
||||||
|
|
||||||
|
# used in many places so include globally, like OpenGL
|
||||||
|
blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
|
||||||
|
|
||||||
elseif(CMAKE_COMPILER_IS_GNUCC)
|
elseif(CMAKE_COMPILER_IS_GNUCC)
|
||||||
# keep GCC specific stuff here
|
# keep GCC specific stuff here
|
||||||
set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
|
set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
|
||||||
|
@ -472,7 +472,7 @@ static int poselib_add_exec (bContext *C, wmOperator *op)
|
|||||||
BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), sizeof(marker->name));
|
BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), sizeof(marker->name));
|
||||||
|
|
||||||
/* use Keying Set to determine what to store for the pose */
|
/* use Keying Set to determine what to store for the pose */
|
||||||
// FIXME: in the past, the Keying Set respected selections (LocRotScale), but the current one doesn't (Whole Character)
|
// FIXME: in the past, the Keying Set respected selections (LocRotScale), but the current one doesn't (WholeCharacter)
|
||||||
// so perhaps we need either a new Keying Set, or just to add overrides here...
|
// so perhaps we need either a new Keying Set, or just to add overrides here...
|
||||||
ANIM_apply_keyingset(C, NULL, act, ks, MODIFYKEY_MODE_INSERT, (float)frame);
|
ANIM_apply_keyingset(C, NULL, act, ks, MODIFYKEY_MODE_INSERT, (float)frame);
|
||||||
|
|
||||||
|
@ -323,7 +323,7 @@ int ED_autokeyframe_pchan(struct bContext *C, struct Scene *scene, struct Object
|
|||||||
#define ANIM_KS_SCALING_ID "Scaling"
|
#define ANIM_KS_SCALING_ID "Scaling"
|
||||||
#define ANIM_KS_LOC_ROT_SCALE_ID "LocRotScale"
|
#define ANIM_KS_LOC_ROT_SCALE_ID "LocRotScale"
|
||||||
#define ANIM_KS_AVAILABLE_ID "Available"
|
#define ANIM_KS_AVAILABLE_ID "Available"
|
||||||
#define ANIM_KS_WHOLE_CHARACTER_ID "Whole Character"
|
#define ANIM_KS_WHOLE_CHARACTER_ID "WholeCharacter"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user