diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-27 15:56:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-27 15:56:36 +0400 |
| commit | bef3be53263eea3c083931447070a209bcf74df6 (patch) | |
| tree | 2526371df532d2fa49575891bea8362bc6202c31 /source/blender/editors/mask | |
| parent | 18e874798d68e4796146e9f5958f66dc3ea61909 (diff) | |
code cleanup: mask keys now dont use space-clip keys - could give troubles later on.
Diffstat (limited to 'source/blender/editors/mask')
| -rw-r--r-- | source/blender/editors/mask/mask_edit.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/mask/mask_select.c | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c index 9ff959c14c1..dc41424b1d9 100644 --- a/source/blender/editors/mask/mask_edit.c +++ b/source/blender/editors/mask/mask_edit.c @@ -497,8 +497,6 @@ void ED_keymap_mask(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "MASK_OT_normals_make_consistent", NKEY, KM_PRESS, KM_CTRL, 0); // WM_keymap_add_item(keymap, "MASK_OT_feather_weight_clear", SKEY, KM_PRESS, KM_ALT, 0); /* ... matches curve editmode */ - RNA_enum_set(WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0)->ptr, - "mode", TFM_MASK_SHRINKFATTEN); /* relationships */ WM_keymap_add_item(keymap, "MASK_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0); @@ -510,7 +508,13 @@ void ED_keymap_mask(wmKeyConfig *keyconf) /* for image editor only */ WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_PRESS, 0, 0); - transform_keymap_for_space(keyconf, keymap, SPACE_CLIP); + /* Transform (don't use transform_keymap_for_space() since this maps to different spaces) */ + WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", GKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", EVT_TWEAK_S, KM_ANY, 0, 0); + WM_keymap_add_item(keymap, "TRANSFORM_OT_resize", SKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "TRANSFORM_OT_rotate", RKEY, KM_PRESS, 0, 0); + kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0); + RNA_enum_set(kmi->ptr, "mode", TFM_MASK_SHRINKFATTEN); } void ED_operatormacros_mask(void) diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index 2f5fef1d59a..81cfbb9b586 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -548,7 +548,6 @@ static int clip_lasso_select_exec(bContext *C, wmOperator *op) return OPERATOR_PASS_THROUGH; } -/* MASKTODO - image space */ void MASK_OT_select_lasso(wmOperatorType *ot) { /* identifiers */ |