diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-30 08:15:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-30 08:15:58 +0300 |
commit | 79d9023f5571247ef892883386f57ab2270064e8 (patch) | |
tree | 68c5b825fd95a5102bcfc613efd52ab9209ca262 | |
parent | 050e863560c8ae0ff711a1d1cfa7d47094ee2e8c (diff) |
bugfix [#24974] "select all" in weight paint -> face selection mode selects all bones instead of all faces
face mask mode overrides pose mode keys. also removed function call from transform code.
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 7 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index aeac6563e1c..4f90a7e7991 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -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); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index f18839836c0..ccadf9704b7 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -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); |