[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38459] trunk/blender/source/blender/ editors/space_node: Changed the default keys for duplicate-nodes-while-keeping-input-links to ctrl+shift+dkey , to avoid conflicts with alt+dkey for linked duplicates.

[Lukas Toenne]

Revision: 38459
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38459
Author:   lukastoenne
Date:     2011-07-17 18:17:35 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Changed the default keys for duplicate-nodes-while-keeping-input-links to ctrl+shift+dkey, to avoid conflicts with alt+dkey for linked duplicates.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c
    trunk/blender/source/blender/editors/space_node/node_ops.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2011-07-17 18:16:24 UTC (rev 38458)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2011-07-17 18:17:35 UTC (rev 38459)
@@ -2038,7 +2038,7 @@
 		 * 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;

Modified: trunk/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_ops.c	2011-07-17 18:16:24 UTC (rev 38458)
+++ trunk/blender/source/blender/editors/space_node/node_ops.c	2011-07-17 18:17:35 UTC (rev 38459)
@@ -163,7 +163,7 @@
 	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);