[Bf-blender-cvs] [422be98c47b] master: Fix T64427: WITH_HEADLESS build option

Campbell Barton noreply at git.blender.org
Mon May 13 09:42:29 CEST 2019


Commit: 422be98c47bb2010722e6d9503ec38d6a87bc55a
Author: Campbell Barton
Date:   Mon May 13 17:41:14 2019 +1000
Branches: master
https://developer.blender.org/rB422be98c47bb2010722e6d9503ec38d6a87bc55a

Fix T64427: WITH_HEADLESS build option

===================================================================

M	intern/ghost/intern/GHOST_SystemNULL.h
M	source/blender/editors/interface/interface_icons.c

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h
index 7f68c801a70..2a07633dc51 100644
--- a/intern/ghost/intern/GHOST_SystemNULL.h
+++ b/intern/ghost/intern/GHOST_SystemNULL.h
@@ -130,8 +130,7 @@ class GHOST_SystemNULL : public GHOST_System {
                                 state,
                                 parentWindow,
                                 type,
-                                ((glSettings.flags & GHOST_glStereoVisual) != 0),
-                                1);
+                                ((glSettings.flags & GHOST_glStereoVisual) != 0));
   }
 };
 
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 6bdbd3c4f1c..09b1f48fd0a 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1869,11 +1869,13 @@ static void icon_draw_size(float x,
 
     float border_outset = 0.0;
     unsigned int border_texel = 0;
+#ifndef WITH_HEADLESS
     if (with_border) {
       const float scale = (float)ICON_GRID_W / (float)ICON_DEFAULT_WIDTH;
       border_texel = ICON_MONO_BORDER_OUTSET;
       border_outset = ICON_MONO_BORDER_OUTSET / (scale * aspect);
     }
+#endif
     icon_draw_texture(x - border_outset,
                       y - border_outset,
                       (float)w + 2 * border_outset,



More information about the Bf-blender-cvs mailing list