diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-26 22:18:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-26 22:18:09 +0400 |
| commit | 6e2cff8c9fa53bb3adf9fb4f8d7502c744288c81 (patch) | |
| tree | 0daaf991324a47b6e4d074f6659bdfd91fc78b79 | |
| parent | 458600d6927775c1949b3d7b43f8d9e9e6f0a930 (diff) | |
rename WholeCharacter in C too, add pthreads include back for msvc which needs it.v2.63
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/editors/armature/poselib.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_keyframing.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 74f951fafa0..7e9e50fa8ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1001,6 +1001,9 @@ elseif(WIN32) 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) # keep GCC specific stuff here set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi") diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index 381423182f9..2799d7994bc 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -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)); /* 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... ANIM_apply_keyingset(C, NULL, act, ks, MODIFYKEY_MODE_INSERT, (float)frame); diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index a70be6dfb54..afb14191797 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -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_LOC_ROT_SCALE_ID "LocRotScale" #define ANIM_KS_AVAILABLE_ID "Available" -#define ANIM_KS_WHOLE_CHARACTER_ID "Whole Character" +#define ANIM_KS_WHOLE_CHARACTER_ID "WholeCharacter" #ifdef __cplusplus } |