Merging r48992 through r48995 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / space_node / node_draw.c
index 57ce303313be05914e820a8741e879cc4328c010..4a0bbe7910068b0e6a89daedba37dc3f24786123 100644 (file)
@@ -721,11 +721,14 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
        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_ThemeColorBlend(color_id, TH_ACTIVE, 0.5f);
                }
        }
+#endif
+
        uiSetRoundBox(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT);
        uiRoundBox(rct->xmin, rct->ymax - NODE_DY, rct->xmax, rct->ymax, BASIS_RAD);
        
@@ -885,11 +888,15 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
        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_ThemeColorBlend(color_id, TH_ACTIVE, 0.5f);
                }
        }
+#else
+       (void)ntree;
+#endif
        
        uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
        
@@ -1136,9 +1143,13 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
                }
                
                node_update_nodetree(C, snode->nodetree, 0.0f, 0.0f);
+
+#ifdef WITH_COMPOSITOR
                if (snode->nodetree->type == NTREE_COMPOSIT) {
                        COM_startReadHighlights();
                } 
+#endif
+
                node_draw_nodetree(C, ar, snode, snode->nodetree);
                
                #if 0