Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 May 2017 03:01:26 +0000 (13:01 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 May 2017 03:01:26 +0000 (13:01 +1000)
1  2 
source/blender/editors/object/object_bake_api.c
source/blender/editors/space_node/node_draw.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c

index a4ea4d2524cf235772d0393099439a394a2263d0,6e25c87d274c8ace0525cb8f199071881e0168fd..fb94ce6e252bf0fc9cd460e3bcf52fcc7d6eeb54
@@@ -886,28 -807,19 +886,20 @@@ static void node_draw_basis(const bCont
        /* shadow */
        node_draw_shadow(snode, node, BASIS_RAD, 1.0f);
        
 -      /* header uses color from backdrop, but we make it opaqie */
 -      if (color_id == TH_NODE) {
 -              float col[3];
 -              UI_GetThemeColorShade3fv(color_id, -20, col);
 -              glColor4f(col[0], col[1], col[2], 1.0f);
 +      if (node->flag & NODE_MUTED) {
 +              UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color);
 +      }
 +      else {
 +              /* header uses color from backdrop, but we make it opaque */
 +              if (color_id == TH_NODE) {
 +                      UI_GetThemeColorShade3fv(color_id, -20, color);
 +                      color[3] = 1.0f;
 +              }
 +              else {
 +                      UI_GetThemeColor4fv(color_id, color);
 +              }
        }
 -      else
 -              UI_ThemeColor(color_id);
 -      
 -      if (node->flag & NODE_MUTED)
 -              UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f);
 -      
  
- #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);
@@@ -1037,22 -977,11 +1029,12 @@@ static void node_draw_hidden(const bCon
        node_draw_shadow(snode, node, hiddenrad, 1.0f);
  
        /* body */
 -      UI_ThemeColor(color_id);
        if (node->flag & NODE_MUTED)
 -              UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f);
 -
 -      UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
 +              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);
        
        /* outline active and selected emphasis */
        if (node->flag & SELECT) {