Changed the default keys for duplicate-nodes-while-keeping-input-links to ctrl+shift...
authorLukas Toenne <lukas.toenne@googlemail.com>
Sun, 17 Jul 2011 18:17:35 +0000 (18:17 +0000)
committerLukas Toenne <lukas.toenne@googlemail.com>
Sun, 17 Jul 2011 18:17:35 +0000 (18:17 +0000)
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_ops.c

index 36e8bc35e7304173b4d2115f6b351fb0f3c49fec..94263091d3b1e6c64482cd002a9bfca3ee80c688 100644 (file)
@@ -2038,7 +2038,7 @@ static int node_duplicate_exec(bContext *C, wmOperator *op)
                 * If keep_inputs is set, also copies input links from unselected (when fromnode==NULL)!
                 */
                if (link->tonode && (link->tonode->flag & NODE_SELECT)
-                       && (keep_inputs || link->fromnode && (link->fromnode->flag & NODE_SELECT))) {
+                       && (keep_inputs || (link->fromnode && (link->fromnode->flag & NODE_SELECT)))) {
                        newlink = MEM_callocN(sizeof(bNodeLink), "bNodeLink");
                        newlink->flag = link->flag;
                        newlink->tonode = link->tonode->new_node;
index 905347d6b80f3f26846ed315826c25ed0de375a1..4bb0283690bc494d6070052c45bbaaebf9280789 100644 (file)
@@ -163,7 +163,7 @@ void node_keymap(struct wmKeyConfig *keyconf)
        WM_keymap_add_menu(keymap, "NODE_MT_add", AKEY, KM_PRESS, KM_SHIFT, 0);
        WM_keymap_add_item(keymap, "NODE_OT_duplicate_move", DKEY, KM_PRESS, KM_SHIFT, 0);
        /* modified operator call for duplicating with input links */
-       WM_keymap_add_item(keymap, "NODE_OT_duplicate_move_keep_inputs", DKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "NODE_OT_duplicate_move_keep_inputs", DKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
        
        WM_keymap_add_item(keymap, "NODE_OT_hide_toggle", HKEY, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "NODE_OT_mute_toggle", MKEY, KM_PRESS, 0, 0);