[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37200] trunk/blender/source/blender/ editors: compile without splash and icons when WITH_HEADLESS is set.
Campbell Barton
ideasman42 at gmail.com
Sun Jun 5 09:55:19 CEST 2011
Revision: 37200
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37200
Author: campbellbarton
Date: 2011-06-05 07:55:18 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
compile without splash and icons when WITH_HEADLESS is set.
Modified Paths:
--------------
trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_file/filelist.c
Modified: trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2011-06-05 04:52:32 UTC (rev 37199)
+++ trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2011-06-05 07:55:18 UTC (rev 37200)
@@ -29,41 +29,48 @@
set(SRC
Bfont.c
- add.png.c
bfont.ttf.c
- blenderbuttons.c
- blob.png.c
- blur.png.c
bmonofont.ttf.c
- clay.png.c
- clone.png.c
- crease.png.c
- darken.png.c
- draw.png.c
- fill.png.c
- flatten.png.c
- grab.png.c
- inflate.png.c
- layer.png.c
- lighten.png.c
- mix.png.c
- multiply.png.c
- nudge.png.c
- pinch.png.c
+ startup.blend.c
preview.blend.c
- prvicons.c
- scrape.png.c
- smear.png.c
- smooth.png.c
- snake_hook.png.c
- soften.png.c
- splash.png.c
- startup.blend.c
- subtract.png.c
- texdraw.png.c
- thumb.png.c
- twist.png.c
- vertexdraw.png.c
)
+if(NOT WITH_HEADLESS)
+ list(APPEND SRC
+ splash.png.c
+ blenderbuttons.c
+
+ # brushes
+ add.png.c
+ blob.png.c
+ blur.png.c
+ clay.png.c
+ clone.png.c
+ crease.png.c
+ darken.png.c
+ draw.png.c
+ fill.png.c
+ flatten.png.c
+ grab.png.c
+ inflate.png.c
+ layer.png.c
+ lighten.png.c
+ mix.png.c
+ multiply.png.c
+ nudge.png.c
+ pinch.png.c
+ prvicons.c
+ scrape.png.c
+ smear.png.c
+ smooth.png.c
+ snake_hook.png.c
+ soften.png.c
+ subtract.png.c
+ texdraw.png.c
+ thumb.png.c
+ twist.png.c
+ vertexdraw.png.c
+ )
+endif()
+
blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/interface/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/interface/CMakeLists.txt 2011-06-05 04:52:32 UTC (rev 37199)
+++ trunk/blender/source/blender/editors/interface/CMakeLists.txt 2011-06-05 07:55:18 UTC (rev 37200)
@@ -63,6 +63,10 @@
add_definitions(-DINTERNATIONAL)
endif()
+if(WITH_HEADLESS)
+ add_definitions(-DWITH_HEADLESS)
+endif()
+
if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
endif()
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c 2011-06-05 04:52:32 UTC (rev 37199)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c 2011-06-05 07:55:18 UTC (rev 37200)
@@ -471,6 +471,9 @@
void ui_draw_but_IMAGE(ARegion *UNUSED(ar), uiBut *UNUSED(but), uiWidgetColors *UNUSED(wcol), rcti *rect)
{
+#ifdef WITH_HEADLESS
+ (void)rect;
+#else
extern char datatoc_splash_png[];
extern int datatoc_splash_png_size;
ImBuf *ibuf;
@@ -507,6 +510,7 @@
*/
IMB_freeImBuf(ibuf);
+#endif
}
#if 0
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c 2011-06-05 04:52:32 UTC (rev 37199)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c 2011-06-05 07:55:18 UTC (rev 37200)
@@ -461,6 +461,7 @@
glDisable(GL_LINE_SMOOTH);
}
+#ifndef WITH_HEADLESS
static void init_brush_icons(void)
{
@@ -588,8 +589,8 @@
IMB_freeImBuf(bbuf);
}
+#endif // WITH_HEADLESS
-
static void init_iconfile_list(struct ListBase *list)
{
IconFile *ifile;
@@ -704,6 +705,7 @@
void UI_icons_free(void)
{
+#ifndef WITH_HEADLESS
if(icongltex.id) {
glDeleteTextures(1, &icongltex.id);
icongltex.id= 0;
@@ -711,6 +713,7 @@
free_iconfile_list(&iconfilelist);
BKE_icons_free();
+#endif
}
void UI_icons_free_drawinfo(void *drawinfo)
@@ -792,10 +795,14 @@
void UI_icons_init(int first_dyn_id)
{
+#ifdef WITH_HEADLESS
+ (void)first_dyn_id;
+#else
init_iconfile_list(&iconfilelist);
BKE_icons_init(first_dyn_id);
init_internal_icons();
init_brush_icons();
+#endif
}
/* Render size for preview images and icons
Modified: trunk/blender/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2011-06-05 04:52:32 UTC (rev 37199)
+++ trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2011-06-05 07:55:18 UTC (rev 37200)
@@ -51,6 +51,10 @@
fsmenu.h
)
+if(WITH_HEADLESS)
+ add_definitions(-DWITH_HEADLESS)
+endif()
+
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
endif()
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c 2011-06-05 04:52:32 UTC (rev 37199)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2011-06-05 07:55:18 UTC (rev 37200)
@@ -373,7 +373,11 @@
short x, y, k;
ImBuf *bbuf;
ImBuf *ibuf;
+#ifdef WITH_HEADLESS
+ bbuf = NULL;
+#else
bbuf = IMB_ibImageFromMemory((unsigned char*)datatoc_prvicons, datatoc_prvicons_size, IB_rect);
+#endif
if (bbuf) {
for (y=0; y<SPECIAL_IMG_ROWS; y++) {
for (x=0; x<SPECIAL_IMG_COLS; x++) {
More information about the Bf-blender-cvs
mailing list