[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35783] trunk/blender/source/blender/ editors/space_node: Moved temporary drag operator link drawing from node tree to node space function .

[Lukas Toenne]

Revision: 35783
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35783
Author:   lukastoenne
Date:     2011-03-25 16:53:07 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
Moved temporary drag operator link drawing from node tree to node space function. Otherwise these links are redrawn for each node group.
Changed selection flag used for the selected_nodes context property from SELECT to NODE_SELECT. These are just incidentally the same, but NODE_SELECT should be used for nodes.

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

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2011-03-25 14:32:47 UTC (rev 35782)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2011-03-25 16:53:07 UTC (rev 35783)
@@ -995,7 +995,6 @@
 {
 	bNode *node;
 	bNodeLink *link;
-	bNodeLinkDrag *nldrag;
 	int a;
 	
 	if(ntree==NULL) return;		/* groups... */
@@ -1030,14 +1029,6 @@
 				node_draw_basis(C, ar, snode, ntree, node);
 		}
 	}	
-	
-	/* temporary links */
-	glEnable(GL_BLEND);
-	glEnable(GL_LINE_SMOOTH);
-	for(nldrag= snode->linkdrag.first; nldrag; nldrag= nldrag->next)
-		node_draw_link(&ar->v2d, snode, nldrag->link);
-	glDisable(GL_LINE_SMOOTH);
-	glDisable(GL_BLEND);
 }
 
 static void group_verify_cb(bContext *UNUSED(C), void *UNUSED(snode_v), void *ngroup_v)
@@ -1213,6 +1204,7 @@
 	SpaceNode *snode= CTX_wm_space_node(C);
 	Scene *scene= CTX_data_scene(C);
 	int color_manage = scene->r.color_mgt_flag & R_COLOR_MANAGEMENT;
+	bNodeLinkDrag *nldrag;
 	
 	UI_ThemeClearColor(TH_BACK);
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -1268,6 +1260,14 @@
 		}
 	}
 	
+	/* temporary links */
+	glEnable(GL_BLEND);
+	glEnable(GL_LINE_SMOOTH);
+	for(nldrag= snode->linkdrag.first; nldrag; nldrag= nldrag->next)
+		node_draw_link(&ar->v2d, snode, nldrag->link);
+	glDisable(GL_LINE_SMOOTH);
+	glDisable(GL_BLEND);
+	
 	/* draw grease-pencil ('canvas' strokes) */
 	if (/*(snode->flag & SNODE_DISPGP) &&*/ (snode->nodetree))
 		draw_gpencil_view2d((bContext*)C, 1);

Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c	2011-03-25 14:32:47 UTC (rev 35782)
+++ trunk/blender/source/blender/editors/space_node/space_node.c	2011-03-25 16:53:07 UTC (rev 35783)
@@ -431,7 +431,7 @@
 		bNode *node;
 		
 		for(next_node(snode->edittree); (node=next_node(NULL));) {
-			if(node->flag & SELECT) {
+			if(node->flag & NODE_SELECT) {
 				CTX_data_list_add(result, &snode->edittree->id, &RNA_Node, node);
 			}
 		}