[Bf-blender-cvs] [1e51839f1d1] master: Cleanup: remove unused modal gizmo keymap
Campbell Barton
noreply at git.blender.org
Tue May 28 07:21:37 CEST 2019
Commit: 1e51839f1d11cdaf63e3cfa4a6005cc2f92319e5
Author: Campbell Barton
Date: Tue May 28 15:18:25 2019 +1000
Branches: master
https://developer.blender.org/rB1e51839f1d11cdaf63e3cfa4a6005cc2f92319e5
Cleanup: remove unused modal gizmo keymap
An operator can only have one modal keymap,
there is no use in defining multiple.
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index fc6a3573275..c72a2bb6a96 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -215,23 +215,6 @@ def _template_items_gizmo_tweak_value_click_drag():
]
-def _template_items_gizmo_tweak_modal():
- return [
- ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None),
- ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None),
- ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None),
- ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None),
- ("PRECISION_ON", {"type": 'RIGHT_SHIFT', "value": 'PRESS', "any": True}, None),
- ("PRECISION_OFF", {"type": 'RIGHT_SHIFT', "value": 'RELEASE', "any": True}, None),
- ("PRECISION_ON", {"type": 'LEFT_SHIFT', "value": 'PRESS', "any": True}, None),
- ("PRECISION_OFF", {"type": 'LEFT_SHIFT', "value": 'RELEASE', "any": True}, None),
- ("SNAP_ON", {"type": 'RIGHT_CTRL', "value": 'PRESS', "any": True}, None),
- ("SNAP_OFF", {"type": 'RIGHT_CTRL', "value": 'RELEASE', "any": True}, None),
- ("SNAP_ON", {"type": 'LEFT_CTRL', "value": 'PRESS', "any": True}, None),
- ("SNAP_OFF", {"type": 'LEFT_CTRL', "value": 'RELEASE', "any": True}, None),
- ]
-
-
def _template_items_editmode_mesh_select_mode(params):
if params.legacy:
return [
@@ -4740,14 +4723,6 @@ def km_generic_gizmos_click_drag(_params):
return keymap
-def km_generic_gizmos_tweak_modal_map(_params):
- keymap = (
- "Generic Gizmos Tweak Modal Map",
- {"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True},
- {"items": _template_items_gizmo_tweak_modal()},
- )
- return keymap
-
def km_generic_gizmos_select(_params):
keymap = (
@@ -4760,11 +4735,24 @@ def km_generic_gizmos_select(_params):
return keymap
-def km_generic_gizmos_select_tweak_modal_map(_params):
+def km_generic_gizmos_tweak_modal_map(_params):
keymap = (
- "Generic Gizmos Select Tweak Modal Map",
+ "Generic Gizmo Tweak Modal Map",
{"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True},
- {"items": _template_items_gizmo_tweak_modal()},
+ {"items": [
+ ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None),
+ ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None),
+ ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None),
+ ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None),
+ ("PRECISION_ON", {"type": 'RIGHT_SHIFT', "value": 'PRESS', "any": True}, None),
+ ("PRECISION_OFF", {"type": 'RIGHT_SHIFT', "value": 'RELEASE', "any": True}, None),
+ ("PRECISION_ON", {"type": 'LEFT_SHIFT', "value": 'PRESS', "any": True}, None),
+ ("PRECISION_OFF", {"type": 'LEFT_SHIFT', "value": 'RELEASE', "any": True}, None),
+ ("SNAP_ON", {"type": 'RIGHT_CTRL', "value": 'PRESS', "any": True}, None),
+ ("SNAP_OFF", {"type": 'RIGHT_CTRL', "value": 'RELEASE', "any": True}, None),
+ ("SNAP_ON", {"type": 'LEFT_CTRL', "value": 'PRESS', "any": True}, None),
+ ("SNAP_OFF", {"type": 'LEFT_CTRL', "value": 'RELEASE', "any": True}, None),
+ ]},
)
return keymap
@@ -5855,9 +5843,8 @@ def generate_keymaps(params=None):
# Gizmos.
km_generic_gizmos(params),
km_generic_gizmos_click_drag(params),
- km_generic_gizmos_tweak_modal_map(params),
km_generic_gizmos_select(params),
- km_generic_gizmos_select_tweak_modal_map(params),
+ km_generic_gizmos_tweak_modal_map(params),
# Pop-Up Keymaps.
km_popup_toolbar(params),
diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
index 39b46fc1bc6..c139ec26d37 100644
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@ -110,22 +110,6 @@ def _template_items_animation():
]
-def _template_items_gizmo_tweak_modal():
- return [
- ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None),
- ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None),
- ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None),
- ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None),
- ("PRECISION_ON", {"type": 'RIGHT_SHIFT', "value": 'PRESS', "any": True}, None),
- ("PRECISION_OFF", {"type": 'RIGHT_SHIFT', "value": 'RELEASE', "any": True}, None),
- ("PRECISION_ON", {"type": 'LEFT_SHIFT', "value": 'PRESS', "any": True}, None),
- ("PRECISION_OFF", {"type": 'LEFT_SHIFT', "value": 'RELEASE', "any": True}, None),
- ("SNAP_ON", {"type": 'RIGHT_CTRL', "value": 'PRESS', "any": True}, None),
- ("SNAP_OFF", {"type": 'RIGHT_CTRL', "value": 'RELEASE', "any": True}, None),
- ("SNAP_ON", {"type": 'LEFT_CTRL', "value": 'PRESS', "any": True}, None),
- ("SNAP_OFF", {"type": 'LEFT_CTRL', "value": 'RELEASE', "any": True}, None),
- ]
-
# Tool System Templates
def _template_items_basic_tools(*, connected=False):
@@ -3545,15 +3529,6 @@ def km_generic_gizmos(_params):
return keymap
-def km_generic_gizmos_tweak_modal_map(_params):
- keymap = (
- "Generic Gizmos Tweak Modal Map",
- {"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True},
- {"items": _template_items_gizmo_tweak_modal()},
- )
- return keymap
-
-
def km_generic_gizmos_select(_params):
keymap = (
"Generic Gizmos Select",
@@ -3565,11 +3540,24 @@ def km_generic_gizmos_select(_params):
return keymap
-def km_generic_gizmos_select_tweak_modal_map(_params):
+def km_generic_gizmos_tweak_modal_map(_params):
keymap = (
- "Generic Gizmos Select Tweak Modal Map",
+ "Generic Gizmo Tweak Modal Map",
{"space_type": 'EMPTY', "region_type": 'WINDOW', "modal": True},
- {"items": _template_items_gizmo_tweak_modal()},
+ {"items": [
+ ("CANCEL", {"type": 'ESC', "value": 'PRESS', "any": True}, None),
+ ("CANCEL", {"type": 'RIGHTMOUSE', "value": 'PRESS', "any": True}, None),
+ ("CONFIRM", {"type": 'RET', "value": 'PRESS', "any": True}, None),
+ ("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'PRESS', "any": True}, None),
+ ("PRECISION_ON", {"type": 'RIGHT_SHIFT', "value": 'PRESS', "any": True}, None),
+ ("PRECISION_OFF", {"type": 'RIGHT_SHIFT', "value": 'RELEASE', "any": True}, None),
+ ("PRECISION_ON", {"type": 'LEFT_SHIFT', "value": 'PRESS', "any": True}, None),
+ ("PRECISION_OFF", {"type": 'LEFT_SHIFT', "value": 'RELEASE', "any": True}, None),
+ ("SNAP_ON", {"type": 'RIGHT_CTRL', "value": 'PRESS', "any": True}, None),
+ ("SNAP_OFF", {"type": 'RIGHT_CTRL', "value": 'RELEASE', "any": True}, None),
+ ("SNAP_ON", {"type": 'LEFT_CTRL', "value": 'PRESS', "any": True}, None),
+ ("SNAP_OFF", {"type": 'LEFT_CTRL', "value": 'RELEASE', "any": True}, None),
+ ]},
)
return keymap
@@ -3786,9 +3774,8 @@ def generate_keymaps(params=None):
# Gizmos.
km_generic_gizmos(params),
- km_generic_gizmos_tweak_modal_map(params),
km_generic_gizmos_select(params),
- km_generic_gizmos_select_tweak_modal_map(params),
+ km_generic_gizmos_tweak_modal_map(params),
# Tool System.
km_3d_view_tool_transform(params),
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
index 1918fc952f1..0280932bc3b 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
@@ -597,7 +597,7 @@ void GIZMOGROUP_OT_gizmo_tweak(wmOperatorType *ot)
/** \} */
-static wmKeyMap *gizmogroup_tweak_modal_keymap(wmKeyConfig *keyconf, const char *gzgroupname)
+wmKeyMap *wm_gizmogroup_tweak_modal_keymap(wmKeyConfig *keyconf)
{
wmKeyMap *keymap;
char name[KMAP_MAX_NAME];
@@ -612,7 +612,7 @@ static wmKeyMap *gizmogroup_tweak_modal_keymap(wmKeyConfig *keyconf, const char
{0, NULL, 0, NULL, NULL},
};
- BLI_snprintf(name, sizeof(name), "%s Tweak Modal Map", gzgroupname);
+ STRNCPY(name, "Generic Gizmo Tweak Modal Map");
keymap = WM_modalkeymap_get(keyconf, name);
/* this function is called for each spacetype, only needs to add map once */
@@ -660,7 +660,6 @@ wmKeyMap *WM_gizmogroup_keymap_template_ex(wmKeyConfig *config,
if (BLI_listbase_is_empty(&km->items)) {
WM_keymap_add_item(km, "GIZMOGROUP_OT_gizmo_tweak", LEFTMOUSE, KM_PRESS, KM_ANY, 0);
}
- gizmogroup_tweak_modal_keymap(config, name);
return km;
}
@@ -709,7 +708,6 @@ wmKeyMap *WM_gizmogroup_keymap_template_select_ex(wmKeyConfig *config,
WM_keymap_add_item(km, "GIZMOGROUP_OT_gizmo_tweak", action_mouse, KM_PRESS, KM_ANY, 0);
WM_keymap_add_item(km, "GIZMOGROUP_OT_gizmo_tweak", select_tweak, KM_ANY, 0, 0);
}
- gizmogroup_tweak_modal_keymap(config, name);
if (do_init) {
wmKeyMapItem *kmi = WM_keymap_add_item(
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
index 2a0233d79b1..1018cc4d58b 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
@@ -76,6 +76,8 @@ bool wm_gizmogroup_is_visible_in_drawstep(const struct wmGizmoGroup *gzgroup,
void wm_gizmogrouptype_setup_keymap(struct wmGizmoGroupType *gzgt, struct wmKeyConfig *keyconf);
+wmKeyMap *wm_gizmogroup_tweak_modal_keymap(struct wmKeyConfig *keyconf);
+
/* ----------------------------------
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list