Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-28 08:18:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-28 08:18:25 +0300
commit1e51839f1d11cdaf63e3cfa4a6005cc2f92319e5 (patch)
tree7fddacf6564f4b4782e9abf6f7cea5fd950fd619 /source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
parent13f292d10d3bb19aa9aa694cecbde499f93e7a54 (diff)
Cleanup: remove unused modal gizmo keymap
An operator can only have one modal keymap, there is no use in defining multiple.
Diffstat (limited to 'source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c')
-rw-r--r--source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c6
1 files changed, 2 insertions, 4 deletions
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(