Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/space_node/node_draw.c
| Context not available. | |||||
| else { | else { | ||||
| const float margin = 3.0f; | const float margin = 3.0f; | ||||
| glColor4f(0.0f, 0.0f, 0.0f, 0.33f); | float color[4] = {0.0f, 0.0f, 0.0f, 0.33f}; | ||||
| glEnable(GL_BLEND); | glEnable(GL_BLEND); | ||||
| UI_draw_roundbox(rct->xmin - margin, rct->ymin - margin, | UI_draw_roundbox(rct->xmin - margin, rct->ymin - margin, | ||||
| rct->xmax + margin, rct->ymax + margin, radius + margin); | rct->xmax + margin, rct->ymax + margin, radius + margin, color); | ||||
| glDisable(GL_BLEND); | glDisable(GL_BLEND); | ||||
| } | } | ||||
| } | } | ||||
| Context not available. | |||||
| /* header uses color from backdrop, but we make it opaqie */ | /* header uses color from backdrop, but we make it opaqie */ | ||||
| if (color_id == TH_NODE) { | if (color_id == TH_NODE) { | ||||
| float col[3]; | UI_GetThemeColorShade3fv(color_id, -20, color); | ||||
| UI_GetThemeColorShade3fv(color_id, -20, col); | |||||
| glColor4f(col[0], col[1], col[2], 1.0f); | |||||
| } | } | ||||
| else | else | ||||
| UI_ThemeColor(color_id); | UI_GetThemeColor4fv(color_id, color); | ||||
| if (node->flag & NODE_MUTED) | if (node->flag & NODE_MUTED) | ||||
| UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f); | UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color); | ||||
| #ifdef WITH_COMPOSITOR | #ifdef WITH_COMPOSITOR | ||||
| if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) { | if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) { | ||||
| if (COM_isHighlightedbNode(node)) { | if (COM_isHighlightedbNode(node)) { | ||||
| UI_ThemeColorBlend(color_id, TH_ACTIVE, 0.5f); | UI_GetThemeColorBlendShade4fv(color_id, TH_ACTIVE, 0.5f, 0, color); | ||||
| } | } | ||||
| } | } | ||||
| #endif | #endif | ||||
| Context not available. | |||||
| glLineWidth(1.0f); | glLineWidth(1.0f); | ||||
| UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT); | UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT); | ||||
| UI_draw_roundbox(rct->xmin, rct->ymax - NODE_DY, rct->xmax, rct->ymax, BASIS_RAD); | UI_draw_roundbox(rct->xmin, rct->ymax - NODE_DY, rct->xmax, rct->ymax, BASIS_RAD, color); | ||||
| /* show/hide icons */ | /* show/hide icons */ | ||||
| iconofs = rct->xmax - 0.35f * U.widget_unit; | iconofs = rct->xmax - 0.35f * U.widget_unit; | ||||
| Context not available. | |||||
| /* body */ | /* body */ | ||||
| if (!nodeIsRegistered(node)) | if (!nodeIsRegistered(node)) | ||||
| UI_ThemeColor4(TH_REDALERT); /* use warning color to indicate undefined types */ | UI_GetThemeColor4fv(TH_REDALERT, color); /* use warning color to indicate undefined types */ | ||||
| else if (node->flag & NODE_CUSTOM_COLOR) | else if (node->flag & NODE_CUSTOM_COLOR) { | ||||
| glColor3fv(node->color); | rgba_float_args_set(color, node->color[0], node->color[1], node->color[2], 1.f); | ||||
| } | |||||
| else | else | ||||
| UI_ThemeColor4(TH_NODE); | UI_GetThemeColor4fv(TH_NODE, color); | ||||
| glEnable(GL_BLEND); | glEnable(GL_BLEND); | ||||
| UI_draw_roundbox_corner_set(UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT); | UI_draw_roundbox_corner_set(UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT); | ||||
| UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax - NODE_DY, BASIS_RAD); | UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax - NODE_DY, BASIS_RAD, color); | ||||
| glDisable(GL_BLEND); | glDisable(GL_BLEND); | ||||
| /* outline active and selected emphasis */ | /* outline active and selected emphasis */ | ||||
| Context not available. | |||||
| /* body */ | /* body */ | ||||
| UI_ThemeColor(color_id); | UI_ThemeColor(color_id); | ||||
| if (node->flag & NODE_MUTED) | if (node->flag & NODE_MUTED) | ||||
| UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f); | UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color); | ||||
| #ifdef WITH_COMPOSITOR | #ifdef WITH_COMPOSITOR | ||||
| if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) { | if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) { | ||||
| if (COM_isHighlightedbNode(node)) { | if (COM_isHighlightedbNode(node)) { | ||||
| UI_ThemeColorBlend(color_id, TH_ACTIVE, 0.5f); | UI_GetThemeColorBlendShade4fv(color_id, TH_ACTIVE, 0.5f, 0, color); | ||||
| } | } | ||||
| } | } | ||||
| #else | #else | ||||
| (void)ntree; | (void)ntree; | ||||
| #endif | #endif | ||||
| UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad); | UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad, color); | ||||
| /* outline active and selected emphasis */ | /* outline active and selected emphasis */ | ||||
| if (node->flag & SELECT) { | if (node->flag & SELECT) { | ||||
| Context not available. | |||||