diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-22 06:33:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-22 06:33:58 +0400 |
| commit | 0bc5fef976270343ee128015f3a2555994b83158 (patch) | |
| tree | 374ee4c52a734a7f9c3f3bf4f0adf49c711aad8d /source | |
| parent | b2a43f5e8cfad97be128821a2c904213847c591b (diff) | |
correct fix for armature selection, also remove international define from generic python C funcs.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 | ||||
| -rw-r--r-- | source/blender/python/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/python/generic/CMakeLists.txt | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index b979962de5d..20368bbf57b 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -4298,7 +4298,7 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor * 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; diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index b21bc142a28..f00d49fe8dd 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -17,9 +17,6 @@ defs = [] 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 diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 0a49036c15d..847a0d19a7f 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -48,8 +48,4 @@ set(SRC py_capi_utils.h ) -if(WITH_INTERNATIONAL) - add_definitions(-DINTERNATIONAL) -endif() - blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}") |