Commit: 9c3e324a0d6cb28c9db58f644838032577b41764
Author: Campbell Barton
Date: Mon Nov 12 09:18:45 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB9c3e324a0d6cb28c9db58f644838032577b41764
Fix headless build
===================================================================
M source/blender/editors/interface/interface_icons.c
===================================================================
diff --git a/source/blender/editors/interface/interface_icons.c
b/source/blender/editors/interface/interface_icons.c
index 5bcacca9214..69f42fbfc07 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -162,6 +162,8 @@ typedef struct IconType {
static struct ListBase iconfilelist = {NULL, NULL};
static IconTexture icongltex = {0, 0, 0, 0.0f, 0.0f};
+#ifndef WITH_HEADLESS
+
static const IconType icontypes[] = {
#define DEF_ICON(name) {ICON_TYPE_MONO_TEXTURE, 0},
#define DEF_ICON_COLLECTION(name) {ICON_TYPE_MONO_TEXTURE, TH_ICON_COLLECTION},
@@ -177,8 +179,6 @@ static const IconType icontypes[] = {
/* **************************************************** */
-#ifndef WITH_HEADLESS
-
static DrawInfo *def_internal_icon(ImBuf *bbuf, int icon_id, int xofs, int
yofs, int size, int type, int theme_color)
{
Icon *new_icon = NULL;
@@ -1616,7 +1616,9 @@ static void icon_draw_size(
UI_widgetbase_draw_cache_flush();
/* Just draw a colored rect - Like for vicon_colorset_draw() */
+#ifndef WITH_HEADLESS
vicon_gplayer_color_draw(icon, (int)x, (int)y, w, h);
+#endif
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
