[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48993] trunk/blender/source/blender: fix for building without the compositor

[Campbell Barton]

Revision: 48993
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48993
Author:   campbellbarton
Date:     2012-07-17 10:19:47 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
fix for building without the compositor

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/CMakeLists.txt
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/windowmanager/CMakeLists.txt
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c

Modified: trunk/blender/source/blender/editors/space_node/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_node/CMakeLists.txt      
2012-07-17 09:58:20 UTC (rev 48992)
+++ trunk/blender/source/blender/editors/space_node/CMakeLists.txt      
2012-07-17 10:19:47 UTC (rev 48993)
@@ -59,4 +59,8 @@
        add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+if(WITH_COMPOSITOR)
+       add_definitions(-DWITH_COMPOSITOR)
+endif()
+
 blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}")

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2012-07-17 
09:58:20 UTC (rev 48992)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2012-07-17 
10:19:47 UTC (rev 48993)
@@ -721,11 +721,14 @@
        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 @@
        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);
        
@@ -1138,9 +1145,13 @@
                }
                
                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

Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt   2012-07-17 
09:58:20 UTC (rev 48992)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt   2012-07-17 
10:19:47 UTC (rev 48993)
@@ -143,4 +143,8 @@
        )
 endif()
 
+if(WITH_COMPOSITOR)
+       add_definitions(-DWITH_COMPOSITOR)
+endif()
+
 blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c    
2012-07-17 09:58:20 UTC (rev 48992)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c    
2012-07-17 10:19:47 UTC (rev 48993)
@@ -200,11 +200,13 @@
 
        BLI_strncpy(G.lib, G.main->name, FILE_MAX);
 
+#ifdef WITH_COMPOSITOR
        if (1) {
                extern void *COM_linker_hack;
                extern void *COM_execute;
                COM_linker_hack = COM_execute;
        }
+#endif
 }
 
 void WM_init_splash(bContext *C)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs