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

Nathan Letwory jesterking at letwory.net
Fri Dec 26 21:50:08 CET 2008


Revision: 18089
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18089
Author:   jesterking
Date:     2008-12-26 21:50:06 +0100 (Fri, 26 Dec 2008)

Log Message:
-----------
2.5 / Nodes

* bring back more code that got lost after careless revision jumping.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c

Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c	2008-12-26 20:44:27 UTC (rev 18088)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c	2008-12-26 20:50:06 UTC (rev 18089)
@@ -103,9 +103,9 @@
 // XXX butspace.h
 #define B_NODE_EXEC			3610
 
+#if 0 // XXX
 static void snode_drawstring(void *curfont, SpaceNode *snode, char *str, int okwidth)
 {
-#if 0 // XXX
 	char drawstr[NODE_MAXSTR];
 	int width;
 	
@@ -126,8 +126,8 @@
 		if(len==0) return;
 	}
 	UI_DrawString(curfont, drawstr, 0);
-#endif
 }
+#endif
 
 static void node_scaling_widget(int color_id, float aspect, float xmin, float ymin, float xmax, float ymax)
 {
@@ -514,8 +514,8 @@
 /* NOTE: this is a block-menu, needs 0 events, otherwise the menu closes */
 static uiBlock *socket_vector_menu(bContext *C, uiMenuBlockHandle *handle, void *socket_v)
 {
-#if 0 //XXX
-	SpaceNode *snode= curarea->spacedata.first;
+	SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
+	ScrArea *sa= CTX_wm_area(C);
 	bNode *node;
 	bNodeSocket *sock= socket_v;
 	bNodeStack *ns= &sock->ns;
@@ -532,7 +532,7 @@
 			break;
 	}
 	
-	block= uiNewBlock(&curarea->uiblocks, "socket menu", UI_EMBOSS, UI_HELV, curarea->win);
+	block= uiBeginBlock(C, handle->region, "socket menu", UI_EMBOSS, UI_HELV);
 
 	/* use this for a fake extra empy space around the buttons */
 	uiDefBut(block, LABEL, 0, "",			-4, -4, 188, 68, NULL, 0, 0, 0, 0, "");
@@ -546,12 +546,11 @@
 	uiButSetFunc(bt, socket_vector_menu_cb, node, snode->nodetree);
 	
 	uiBlockSetDirection(block, UI_TOP);
+	uiEndBlock(C, block);
 	
-	// allqueue(REDRAWNODE, 0);
+	ED_area_tag_redraw(sa);
 	
 	return block;
-#endif
-return NULL;
 }
 
 /* not a callback */





More information about the Bf-blender-cvs mailing list