[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38375] trunk/blender/source/blender/ editors: dont include the preview.blend in headless mode
Campbell Barton
ideasman42 at gmail.com
Wed Jul 13 21:27:42 CEST 2011
Revision: 38375
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38375
Author: campbellbarton
Date: 2011-07-13 19:27:42 +0000 (Wed, 13 Jul 2011)
Log Message:
-----------
dont include the preview.blend in headless mode
Modified Paths:
--------------
trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/render/render_preview.c
Modified: trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2011-07-13 19:20:50 UTC (rev 38374)
+++ trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2011-07-13 19:27:42 UTC (rev 38375)
@@ -37,13 +37,16 @@
# blender only
list(APPEND SRC
startup.blend.c
- preview.blend.c
bmonofont.ttf.c
)
if(NOT WITH_HEADLESS)
# blender UI only
list(APPEND SRC
+ # blends
+ preview.blend.c
+
+ # images
splash.png.c
blenderbuttons.c
Modified: trunk/blender/source/blender/editors/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/render/CMakeLists.txt 2011-07-13 19:20:50 UTC (rev 38374)
+++ trunk/blender/source/blender/editors/render/CMakeLists.txt 2011-07-13 19:27:42 UTC (rev 38375)
@@ -60,4 +60,8 @@
add_definitions(-DPARALLEL=1)
endif()
+if(WITH_HEADLESS)
+ add_definitions(-DWITH_HEADLESS)
+endif()
+
blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2011-07-13 19:20:50 UTC (rev 38374)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2011-07-13 19:27:42 UTC (rev 38375)
@@ -171,6 +171,7 @@
void ED_preview_init_dbase(void)
{
+#ifndef WITH_HEADLESS
BlendFileData *bfd;
extern int datatoc_preview_blend_size;
extern char datatoc_preview_blend[];
@@ -184,6 +185,7 @@
MEM_freeN(bfd);
}
G.fileflags= fileflags;
+#endif
}
void ED_preview_free_dbase(void)
More information about the Bf-blender-cvs
mailing list