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>2018-07-04 15:00:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-04 15:00:21 +0300
commit88b297da99ee61630c36df63fb2f63ca32d8de54 (patch)
treefafb4af1be2295c05b7e55e871a88cf5a4b6df87 /source/blender/editors/space_node/node_ops.c
parent7d355008bfeb80e4e8f337c1015bc5447e0bb9f5 (diff)
Keymap: resolve group/un-group inconsistencies
Apply grouping changes proposed in T55162 - Ctrl-G to make a group. - Ctrl-Alt-G to ungroup.
Diffstat (limited to 'source/blender/editors/space_node/node_ops.c')
-rw-r--r--source/blender/editors/space_node/node_ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c
index ed96bb21412..2a585c42395 100644
--- a/source/blender/editors/space_node/node_ops.c
+++ b/source/blender/editors/space_node/node_ops.c
@@ -333,7 +333,7 @@ void node_keymap(struct wmKeyConfig *keyconf)
/* node group operators */
WM_keymap_add_item(keymap, "NODE_OT_group_make", GKEY, KM_PRESS, KM_CTRL, 0);
- WM_keymap_add_item(keymap, "NODE_OT_group_ungroup", GKEY, KM_PRESS, KM_ALT, 0);
+ WM_keymap_add_item(keymap, "NODE_OT_group_ungroup", GKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
WM_keymap_add_item(keymap, "NODE_OT_group_separate", PKEY, KM_PRESS, 0, 0);
kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0);
RNA_boolean_set(kmi->ptr, "exit", false);