[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18968] branches/blender2.5/blender/source /blender/editors/space_node: 2.5

[Ton Roosendaal]

Revision: 18968
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18968
Author:   ton
Date:     2009-02-14 14:18:18 +0100 (Sat, 14 Feb 2009)

Log Message:
-----------
2.5

Node editor: adding node sends proper redraw now, and calls
the old 'auto connect' to make it link to active node.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
    branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
    branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h

Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c	2009-02-14 13:07:09 UTC (rev 18967)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c	2009-02-14 13:18:18 UTC (rev 18968)
@@ -204,7 +204,7 @@
 		return nodeGetActive(ntree);
 }
 
-static void snode_handle_recalc(bContext *C, SpaceNode *snode)
+void snode_handle_recalc(bContext *C, SpaceNode *snode)
 {
 	if(snode->treetype==NTREE_SHADER)
 		WM_event_add_notifier(C, NC_MATERIAL|ND_NODES, snode->id);

Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_header.c	2009-02-14 13:07:09 UTC (rev 18967)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_header.c	2009-02-14 13:18:18 UTC (rev 18968)
@@ -125,12 +125,8 @@
 
 void do_node_addmenu(bContext *C, void *arg, int event)
 {
-	// XXX enable
-	// ScrArea *curarea= CTX_wm_area(C);
 	SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
 	bNode *node;
-	//float locx, locy;
-	//short mval[2];
 	
 	/* store selection in temp test flag */
 	for(node= snode->edittree->nodes.first; node; node= node->next) {
@@ -138,15 +134,12 @@
 		else node->flag &= ~NODE_TEST;
 	}
 	
-	// toolbox_mousepos(mval, 0 ); /* get initial mouse position */
-	// areamouseco_to_ipoco(G.v2d, mval, &locx, &locy);
-	// NODE_FIX_ME
-	node= node_add_node(snode, CTX_data_scene(C), event, 0.0, 0.0);
+	node= node_add_node(snode, CTX_data_scene(C), event, snode->mx, snode->my);
 	
 	/* uses test flag */
-	// XXX snode_autoconnect(snode, node, NODE_TEST);
+	snode_autoconnect(snode, node, NODE_TEST);
 		
-	// XXX addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC);
+	snode_handle_recalc(C, snode);
 }
 
 static void node_make_addmenu(bContext *C, int nodeclass, uiBlock *block)

Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h	2009-02-14 13:07:09 UTC (rev 18967)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h	2009-02-14 13:18:18 UTC (rev 18968)
@@ -67,6 +67,7 @@
 void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode);
 
 /* node_edit.c */
+void snode_handle_recalc(bContext *C, SpaceNode *snode);
 bNode *next_node(bNodeTree *ntree);
 bNode *node_add_node(SpaceNode *snode, Scene *scene, int type, float locx, float locy);
 void snode_set_context(SpaceNode *snode, Scene *scene);
@@ -79,6 +80,7 @@
 void node_texture_default(Tex *tx);
 void snode_composite_job(const struct bContext *C, ScrArea *sa);
 bNode *snode_get_editgroup(SpaceNode *snode);
+void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag);
 
 void NODE_OT_link(struct wmOperatorType *ot);
 void NODE_OT_delete_selection(struct wmOperatorType *ot);