rename WholeCharacter in C too, add pthreads include back for msvc which needs it.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Apr 2012 18:18:09 +0000 (18:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Apr 2012 18:18:09 +0000 (18:18 +0000)
CMakeLists.txt
source/blender/editors/armature/poselib.c
source/blender/editors/include/ED_keyframing.h

index 74f951fafa00b6d2b57394b51394aa4e3a472681..7e9e50fa8ede2b3cf23f12ef1dedacd5ab19d939 100644 (file)
@@ -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")
index 381423182f9bc8f0d8d284432a409e0f8485ad16..2799d7994bc2ee91be063fa5f757956a6481a1b7 100644 (file)
@@ -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);
        
index a70be6dfb54172696d5cbb90cec952ac5a875507..afb14191797d4dccd2ff60469fbd626e9f240c48 100644 (file)
@@ -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
 }