Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Campbell Barton
2020-05-25 15:55:54 +10:00
parent ffcb87813b c15bb3b55f
commit 5a842b3412
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -628,12 +628,6 @@ if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL)
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF") message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif() endif()
# may as well build python module without a UI
if(WITH_PYTHON_MODULE)
set(WITH_HEADLESS ON)
endif()
if(NOT WITH_PYTHON) if(NOT WITH_PYTHON)
set(WITH_CYCLES OFF) set(WITH_CYCLES OFF)
set(WITH_DRACO OFF) set(WITH_DRACO OFF)

3
source/blender/windowmanager/intern/wm_splash_screen.c
View File

@@ -129,6 +129,7 @@ static void get_version_string(char *ver, const int max_length)
version_cycle_number); version_cycle_number);
} }
#ifndef WITH_HEADLESS
static void wm_block_splash_image_roundcorners_add(ImBuf *ibuf) static void wm_block_splash_image_roundcorners_add(ImBuf *ibuf)
{ {
uchar *rct = (uchar *)ibuf->rect; uchar *rct = (uchar *)ibuf->rect;
@@ -179,6 +180,7 @@ static void wm_block_splash_image_roundcorners_add(ImBuf *ibuf)
} }
} }
} }
#endif /* WITH_HEADLESS */
static ImBuf *wm_block_splash_image(int width, int *r_height) static ImBuf *wm_block_splash_image(int width, int *r_height)
{ {
@@ -219,6 +221,7 @@ static ImBuf *wm_block_splash_image(int width, int *r_height)
return ibuf; return ibuf;
#else #else
UNUSED_VARS(width, r_height);
return NULL; return NULL;
#endif #endif
} }