forked from bartvdbraak/blender
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.
This commit is contained in:
parent
62beafdd19
commit
fb2fd88463
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user