[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28017] trunk/blender/source/blender/ editors/space_node: Request: auto link to viewer node back.

[Ton Roosendaal]

Revision: 28017
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28017
Author:   ton
Date:     2010-04-05 20:34:18 +0200 (Mon, 05 Apr 2010)

Log Message:
-----------
Request: auto link to viewer node back. Used to be ctrl+click, is now
shift+ctrl+click, because the ctrl_click goes to knife cutting.

Implementation note: this is a macro, select + link.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c
    trunk/blender/source/blender/editors/space_node/node_intern.h
    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	2010-04-05 17:30:11 UTC (rev 28016)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2010-04-05 18:34:18 UTC (rev 28017)
@@ -910,13 +910,40 @@
 }
 
 
-void node_active_link_viewer(SpaceNode *snode)
+static int node_active_link_viewer(bContext *C, wmOperator *op)
 {
-	bNode *node= editnode_get_active(snode->edittree);
-	if(node)
+	SpaceNode *snode= CTX_wm_space_node(C);
+	bNode *node;
+	
+	
+	node= editnode_get_active(snode->edittree);
+	
+	if(node) {
 		node_link_viewer(snode, node);
+		snode_notify(C, snode);
+	}
+	return OPERATOR_FINISHED;
 }
 
+
+
+void NODE_OT_link_viewer(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Link to Viewer Node";
+	ot->description = "Link to Viewer Node";
+	ot->idname= "NODE_OT_link_viewer";
+	
+	/* api callbacks */
+	ot->exec= node_active_link_viewer;
+	ot->poll= ED_operator_node_active;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
+
+
 /* return 0, nothing done */
 /*static*/ int node_mouse_groupheader(SpaceNode *snode)
 {

Modified: trunk/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_intern.h	2010-04-05 17:30:11 UTC (rev 28016)
+++ trunk/blender/source/blender/editors/space_node/node_intern.h	2010-04-05 18:34:18 UTC (rev 28017)
@@ -102,7 +102,9 @@
 void NODE_OT_hide(struct wmOperatorType *ot);
 
 void NODE_OT_show_cyclic_dependencies(struct wmOperatorType *ot);
+void NODE_OT_link_viewer(struct wmOperatorType *ot);
 
+
 // XXXXXX
 
 // XXX from BSE_node.h

Modified: trunk/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_ops.c	2010-04-05 17:30:11 UTC (rev 28016)
+++ trunk/blender/source/blender/editors/space_node/node_ops.c	2010-04-05 18:34:18 UTC (rev 28017)
@@ -69,6 +69,8 @@
 	WM_operatortype_append(NODE_OT_group_make);
 	WM_operatortype_append(NODE_OT_group_ungroup);
 	WM_operatortype_append(NODE_OT_group_edit);
+	
+	WM_operatortype_append(NODE_OT_link_viewer);
 }
 
 void ED_operatormacros_node(void)
@@ -78,6 +80,11 @@
 	ot= WM_operatortype_append_macro("NODE_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "NODE_OT_duplicate");
 	WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
+
+	ot= WM_operatortype_append_macro("NODE_OT_select_link_viewer", "Link Viewer", OPTYPE_UNDO);
+	WM_operatortype_macro_define(ot, "NODE_OT_select");
+	WM_operatortype_macro_define(ot, "NODE_OT_link_viewer");
+	
 }
 
 void node_keymap(struct wmKeyConfig *keyconf)
@@ -110,6 +117,8 @@
 	WM_keymap_add_item(keymap, "NODE_OT_visibility_toggle", LEFTMOUSE, KM_PRESS, 0, 0);
 	
 	WM_keymap_add_item(keymap, "NODE_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "NODE_OT_select_link_viewer", LEFTMOUSE, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+	
 	WM_keymap_add_item(keymap, "NODE_OT_link_make", FKEY, KM_PRESS, 0, 0);
 	RNA_boolean_set(WM_keymap_add_item(keymap, "NODE_OT_link_make", FKEY, KM_PRESS, KM_CTRL, 0)->ptr, "replace", 1);