diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-05-16 06:01:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-16 06:01:26 +0300 |
commit | 57660aac743a70eea0b917ae92dd5d6bdb1b12a9 (patch) | |
tree | 59b23a0e8540e72c1d98fed5e5d75d7214482c2e /source/blender/editors/space_node/node_draw.c | |
parent | 5a90542d3d4ba1a193975a3cb9c50eec1f6a8c8a (diff) | |
parent | d508b69e44bb3c5911d7716048c28fe0dc5e609b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_node/node_draw.c')
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index a4ea4d2524c..fb94ce6e252 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -900,14 +900,6 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN } } -#ifdef WITH_COMPOSITOR - if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) { - if (COM_isHighlightedbNode(node)) { - UI_GetThemeColorBlendShade4fv(color_id, TH_ACTIVE, 0.5f, 0, color); - } - } -#endif - glLineWidth(1.0f); UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT); @@ -1041,16 +1033,6 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color); else UI_GetThemeColor4fv(color_id, color); - -#ifdef WITH_COMPOSITOR - if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) { - if (COM_isHighlightedbNode(node)) { - UI_GetThemeColorBlendShade4fv(color_id, TH_ACTIVE, 0.5f, 0, color); - } - } -#else - (void)ntree; -#endif UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad, color); @@ -1302,15 +1284,9 @@ static void snode_setup_v2d(SpaceNode *snode, ARegion *ar, const float center[2] static void draw_nodetree(const bContext *C, ARegion *ar, bNodeTree *ntree, bNodeInstanceKey parent_key) { SpaceNode *snode = CTX_wm_space_node(C); - + node_uiblocks_init(C, ntree); - -#ifdef WITH_COMPOSITOR - if (ntree->type == NTREE_COMPOSIT) { - COM_startReadHighlights(); - } -#endif - + node_update_nodetree(C, ntree); node_draw_nodetree(C, ar, snode, ntree, parent_key); } |