[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40442] trunk/blender/source/blender: correct fix for armature selection, also remove international define from generic python C funcs.

[Campbell Barton]

Revision: 40442
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40442
Author:   campbellbarton
Date:     2011-09-22 02:33:58 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
correct fix for armature selection, also remove international define from generic python C funcs.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/armature/editarmature.c
    trunk/blender/source/blender/python/SConscript
    trunk/blender/source/blender/python/generic/CMakeLists.txt

Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c	2011-09-21 21:17:38 UTC (rev 40441)
+++ trunk/blender/source/blender/editors/armature/editarmature.c	2011-09-22 02:33:58 UTC (rev 40442)
@@ -4298,7 +4298,7 @@
 		 * note, special exception for armature mode so we can do multi-select
 		 * we could check for multi-select explicitly but think its fine to
 		 * always give pradictable behavior in weight paint mode - campbell */
-		if (!extend || (ob_act && ob_act->mode & OB_MODE_WEIGHT_PAINT)) {
+		if (!extend || ((ob_act && (ob_act != ob) && (ob_act->mode & OB_MODE_WEIGHT_PAINT)==0))) {
 			ED_pose_deselectall(ob, 0);
 			nearBone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
 			arm->act_bone= nearBone;

Modified: trunk/blender/source/blender/python/SConscript
===================================================================
--- trunk/blender/source/blender/python/SConscript	2011-09-21 21:17:38 UTC (rev 40441)
+++ trunk/blender/source/blender/python/SConscript	2011-09-22 02:33:58 UTC (rev 40442)
@@ -17,9 +17,6 @@
 if is_debug:
     defs.append('_DEBUG')
 
-if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
-
 sources = env.Glob('generic/*.c')
 env.BlenderLib( libname = 'bf_python_ext', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [363,165]) # ketsji is 360
 

Modified: trunk/blender/source/blender/python/generic/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/python/generic/CMakeLists.txt	2011-09-21 21:17:38 UTC (rev 40441)
+++ trunk/blender/source/blender/python/generic/CMakeLists.txt	2011-09-22 02:33:58 UTC (rev 40442)
@@ -48,8 +48,4 @@
 	py_capi_utils.h
 )
 
-if(WITH_INTERNATIONAL)
-        add_definitions(-DINTERNATIONAL)
-endif()
-
 blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}")