[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45993] trunk/blender: rename WholeCharacter in C too, add pthreads include back for msvc which needs it.

[Campbell Barton]

Revision: 45993
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45993
Author:   campbellbarton
Date:     2012-04-26 18:18:09 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
rename WholeCharacter in C too, add pthreads include back for msvc which needs it.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/editors/armature/poselib.c
    trunk/blender/source/blender/editors/include/ED_keyframing.h

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-04-26 18:07:15 UTC (rev 45992)
+++ trunk/blender/CMakeLists.txt	2012-04-26 18:18:09 UTC (rev 45993)
@@ -1001,6 +1001,9 @@
 
 		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")

Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c	2012-04-26 18:07:15 UTC (rev 45992)
+++ trunk/blender/source/blender/editors/armature/poselib.c	2012-04-26 18:18:09 UTC (rev 45993)
@@ -472,7 +472,7 @@
 	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);
 	

Modified: trunk/blender/source/blender/editors/include/ED_keyframing.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_keyframing.h	2012-04-26 18:07:15 UTC (rev 45992)
+++ trunk/blender/source/blender/editors/include/ED_keyframing.h	2012-04-26 18:18:09 UTC (rev 45993)
@@ -323,7 +323,7 @@
 #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
 }