Moved temporary drag operator link drawing from node tree to node space function...
authorLukas Toenne <lukas.toenne@googlemail.com>
Fri, 25 Mar 2011 16:53:07 +0000 (16:53 +0000)
committerLukas Toenne <lukas.toenne@googlemail.com>
Fri, 25 Mar 2011 16:53:07 +0000 (16:53 +0000)
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.

source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/space_node.c

index 920e670573d29c364e9acfc79b060a181b915c3c..0c9f12966efe13c6e79f6a8c0cc91c65f4b8b291 100644 (file)
@@ -995,7 +995,6 @@ static void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode,
 {
        bNode *node;
        bNodeLink *link;
-       bNodeLinkDrag *nldrag;
        int a;
        
        if(ntree==NULL) return;         /* groups... */
@@ -1030,14 +1029,6 @@ static void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode,
                                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 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
        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 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
                }
        }
        
+       /* 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);
index 5d9cb183e60346620c45bfc6233f2f0a089e7d41..c0e9e8e22e1b2bb7360cd69b32949879a5cafabc 100644 (file)
@@ -431,7 +431,7 @@ static int node_context(const bContext *C, const char *member, bContextDataResul
                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);
                        }
                }