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/editors/space_node | |
| parent | e3c110e72e9d7a893d1681eeb84287032fc53d17 (diff) | |
| parent | 18d135d05c53885eb7460e1c95cc8ebbdb771102 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 142d6fdc237..759b157b3f8 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -231,13 +231,13 @@ void node_keymap(struct wmKeyConfig *keyconf) wmKeyMapItem *kmi; /* Entire Editor only ----------------- */ - keymap = WM_keymap_find(keyconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_ensure(keyconf, "Node Generic", SPACE_NODE, 0); WM_keymap_add_item(keymap, "NODE_OT_properties", NKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_toolbar", TKEY, KM_PRESS, 0, 0); /* Main Region only ----------------- */ - keymap = WM_keymap_find(keyconf, "Node Editor", SPACE_NODE, 0); + keymap = WM_keymap_ensure(keyconf, "Node Editor", SPACE_NODE, 0); /* mouse select in nodes used to be both keys, but perhaps this should be reduced? * NOTE: mouse-clicks on left-mouse will fall through to allow transform-tweak, but also link/resize diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 51ba3a62d1b..38bc1b6da8d 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -596,7 +596,7 @@ static void node_buttons_region_init(wmWindowManager *wm, ARegion *ar) ED_region_panels_init(wm, ar); - keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); } @@ -612,7 +612,7 @@ static void node_toolbar_region_init(wmWindowManager *wm, ARegion *ar) ED_region_panels_init(wm, ar); - keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); } @@ -655,10 +655,10 @@ static void node_main_region_init(wmWindowManager *wm, ARegion *ar) WM_gizmomap_add_handlers(ar, ar->gizmo_map); /* own keymaps */ - keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); - keymap = WM_keymap_find(wm->defaultconf, "Node Editor", SPACE_NODE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Node Editor", SPACE_NODE, 0); WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); /* add drop boxes */ |