diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 06:40:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 06:40:10 +0300 |
| commit | 7c6136b35ca18da5a36b6030ade3b45dc5cb483d (patch) | |
| tree | ccbb462c30e9c1f7419ff255e2ddfee7bbc81b91 /source/blender/windowmanager/gizmo | |
| parent | e3c110e72e9d7a893d1681eeb84287032fc53d17 (diff) | |
| parent | 18d135d05c53885eb7460e1c95cc8ebbdb771102 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/gizmo')
| -rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index 3ba9fa71601..e46cd9049a5 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -656,7 +656,7 @@ wmKeyMap *WM_gizmogroup_keymap_common( const wmGizmoGroupType *gzgt, wmKeyConfig *config) { /* Use area and region id since we might have multiple gizmos with the same name in different areas/regions */ - wmKeyMap *km = WM_keymap_find(config, gzgt->name, gzgt->gzmap_params.spaceid, gzgt->gzmap_params.regionid); + wmKeyMap *km = WM_keymap_ensure(config, gzgt->name, gzgt->gzmap_params.spaceid, gzgt->gzmap_params.regionid); WM_keymap_add_item(km, "GIZMOGROUP_OT_gizmo_tweak", LEFTMOUSE, KM_PRESS, KM_ANY, 0); gizmogroup_tweak_modal_keymap(config, gzgt->name); @@ -671,7 +671,7 @@ wmKeyMap *WM_gizmogroup_keymap_common_select( const wmGizmoGroupType *gzgt, wmKeyConfig *config) { /* Use area and region id since we might have multiple gizmos with the same name in different areas/regions */ - wmKeyMap *km = WM_keymap_find(config, gzgt->name, gzgt->gzmap_params.spaceid, gzgt->gzmap_params.regionid); + wmKeyMap *km = WM_keymap_ensure(config, gzgt->name, gzgt->gzmap_params.spaceid, gzgt->gzmap_params.regionid); WM_keymap_add_item(km, "GIZMOGROUP_OT_gizmo_tweak", ACTIONMOUSE, KM_PRESS, KM_ANY, 0); WM_keymap_add_item(km, "GIZMOGROUP_OT_gizmo_tweak", EVT_TWEAK_S, KM_ANY, 0, 0); diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index d0f6ab9f451..2c0d0ff34a7 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -1131,7 +1131,7 @@ void wm_gizmomaptypes_free(void) void wm_gizmos_keymap(wmKeyConfig *keyconf) { /* we add this item-less keymap once and use it to group gizmo-group keymaps into it */ - WM_keymap_find(keyconf, "Gizmos", 0, 0); + WM_keymap_ensure(keyconf, "Gizmos", 0, 0); for (wmGizmoMapType *gzmap_type = gizmomaptypes.first; gzmap_type; gzmap_type = gzmap_type->next) { for (wmGizmoGroupTypeRef *gzgt_ref = gzmap_type->grouptype_refs.first; gzgt_ref; gzgt_ref = gzgt_ref->next) { |