Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_node / node_ops.c
index ea07341beb98b22633d9082f798cfee088193be6..dccc999b2d143bf482084a635e865112c81d28b4 100644 (file)
@@ -94,8 +94,7 @@ void node_operatortypes(void)
 
        WM_operatortype_append(NODE_OT_insert_offset);
 
-       WM_operatortype_append(NODE_OT_read_renderlayers);
-       WM_operatortype_append(NODE_OT_read_fullsamplelayers);
+       WM_operatortype_append(NODE_OT_read_viewlayers);
        WM_operatortype_append(NODE_OT_render_changed);
 
        WM_operatortype_append(NODE_OT_backimage_move);
@@ -278,6 +277,8 @@ void node_keymap(struct wmKeyConfig *keyconf)
        WM_keymap_add_item(keymap, "NODE_OT_backimage_fit", HOMEKEY, KM_PRESS, KM_ALT, 0);
        WM_keymap_add_item(keymap, "NODE_OT_backimage_sample", ACTIONMOUSE, KM_PRESS, KM_ALT, 0);
 
+       WM_keymap_add_menu(keymap, "NODE_MT_specials", WKEY, KM_PRESS, 0, 0);
+
        kmi = WM_keymap_add_item(keymap, "NODE_OT_link_make", FKEY, KM_PRESS, 0, 0);
        RNA_boolean_set(kmi->ptr, "replace", false);
        kmi = WM_keymap_add_item(keymap, "NODE_OT_link_make", FKEY, KM_PRESS, KM_SHIFT, 0);
@@ -308,10 +309,14 @@ void node_keymap(struct wmKeyConfig *keyconf)
 
        WM_keymap_add_item(keymap, "NODE_OT_delete", XKEY, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "NODE_OT_delete", DELKEY, KM_PRESS, 0, 0);
+
        WM_keymap_add_item(keymap, "NODE_OT_delete_reconnect", XKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "NODE_OT_delete_reconnect", DELKEY, KM_PRESS, KM_CTRL, 0);
 
        kmi = WM_keymap_add_item(keymap, "NODE_OT_select_all", AKEY, KM_PRESS, 0, 0);
-       RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
+       RNA_enum_set(kmi->ptr, "action", SEL_SELECT);
+       kmi = WM_keymap_add_item(keymap, "NODE_OT_select_all", AKEY, KM_PRESS, KM_ALT, 0);
+       RNA_enum_set(kmi->ptr, "action", SEL_DESELECT);
        kmi = WM_keymap_add_item(keymap, "NODE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
        RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
 
@@ -331,15 +336,14 @@ 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);
        kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, KM_CTRL, 0);
        RNA_boolean_set(kmi->ptr, "exit", true);
 
-       WM_keymap_add_item(keymap, "NODE_OT_read_renderlayers", RKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "NODE_OT_read_fullsamplelayers", RKEY, KM_PRESS, KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "NODE_OT_read_viewlayers", RKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "NODE_OT_render_changed", ZKEY, KM_PRESS, 0, 0);
 
        WM_keymap_add_item(keymap, "NODE_OT_clipboard_copy", CKEY, KM_PRESS, KM_CTRL, 0);