griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix [#24974] "select all" in weight paint -> face selection mode selects all bones instead of all faces

Browse Source 
face mask mode overrides pose mode keys. also removed function call from transform code.
This commit is contained in:
Campbell Barton
2010-11-30 05:15:58 +00:00
parent 050e863560
commit 79d9023f55
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_view3d/space_view3d.c
View File

@@ -317,6 +317,10 @@ static void view3d_main_area_init(wmWindowManager *wm, ARegion *ar)
/* object ops. */
/* important to be before Pose keymap since they can both be enabled at once */
keymap= WM_keymap_find(wm->defaultconf, "Face Mask", 0, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
/* pose is not modal, operator poll checks for this */
keymap= WM_keymap_find(wm->defaultconf, "Pose", 0, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
@@ -332,9 +336,6 @@ static void view3d_main_area_init(wmWindowManager *wm, ARegion *ar)
keymap= WM_keymap_find(wm->defaultconf, "Weight Paint", 0, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
keymap= WM_keymap_find(wm->defaultconf, "Face Mask", 0, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
keymap= WM_keymap_find(wm->defaultconf, "Sculpt", 0, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);

6
source/blender/editors/transform/transform.c
View File

@@ -3111,9 +3111,7 @@ int Rotation(TransInfo *t, short UNUSED(mval[2]))
char str[64];
float final;
float mat[3][3];
final = t->values[0];
applyNDofInput(&t->ndof, &final);
@@ -3152,8 +3150,6 @@ int Rotation(TransInfo *t, short UNUSED(mval[2]))
}
t->values[0] = final;
vec_rot_to_mat3( mat, t->axis, final);
applyRotation(t, final, t->axis);