bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

correct fix for armature selection, also remove international define from generic python C funcs.

Browse Source
This commit is contained in:
Campbell Barton 2011-09-22 02:33:58 +00:00
parent b2a43f5e8c
commit 0bc5fef976
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/armature/editarmature.c
View File

@ -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 * note, special exception for armature mode so we can do multi-select
* we could check for multi-select explicitly but think its fine to * we could check for multi-select explicitly but think its fine to
* always give pradictable behavior in weight paint mode - campbell */ * 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); ED_pose_deselectall(ob, 0);
nearBone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL); nearBone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
arm->act_bone= nearBone; arm->act_bone= nearBone;

3
source/blender/python/SConscript
View File

@ -17,9 +17,6 @@ defs = []
if is_debug: if is_debug:
defs.append('_DEBUG') defs.append('_DEBUG')
if env['WITH_BF_INTERNATIONAL']:
defs.append('INTERNATIONAL')
sources = env.Glob('generic/*.c') 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 env.BlenderLib( libname = 'bf_python_ext', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [363,165]) # ketsji is 360

4
source/blender/python/generic/CMakeLists.txt
View File

@ -48,8 +48,4 @@ set(SRC
py_capi_utils.h py_capi_utils.h
) )
if(WITH_INTERNATIONAL)
add_definitions(-DINTERNATIONAL)
endif()
blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}") blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}")