[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49289] trunk/blender/source/blender/ editors/mask: code cleanup: mask keys now dont use space-clip keys - could give troubles later on.
Campbell Barton
ideasman42 at gmail.com
Fri Jul 27 13:56:37 CEST 2012
Revision: 49289
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49289
Author: campbellbarton
Date: 2012-07-27 11:56:36 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
code cleanup: mask keys now dont use space-clip keys - could give troubles later on.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mask/mask_edit.c
trunk/blender/source/blender/editors/mask/mask_select.c
Modified: trunk/blender/source/blender/editors/mask/mask_edit.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_edit.c 2012-07-27 11:34:20 UTC (rev 49288)
+++ trunk/blender/source/blender/editors/mask/mask_edit.c 2012-07-27 11:56:36 UTC (rev 49289)
@@ -497,8 +497,6 @@
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 @@
/* 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)
Modified: trunk/blender/source/blender/editors/mask/mask_select.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_select.c 2012-07-27 11:34:20 UTC (rev 49288)
+++ trunk/blender/source/blender/editors/mask/mask_select.c 2012-07-27 11:56:36 UTC (rev 49289)
@@ -548,7 +548,6 @@
return OPERATOR_PASS_THROUGH;
}
-/* MASKTODO - image space */
void MASK_OT_select_lasso(wmOperatorType *ot)
{
/* identifiers */
More information about the Bf-blender-cvs
mailing list