diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-05-25 08:55:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-25 08:55:54 +0300 |
| commit | 5a842b3412c100588bc1f7a9d4532e810e8e1792 (patch) | |
| tree | 25047515ade6484132b83b490614db9f893b937e | |
| parent | ffcb87813be7c10c5f2553ab961896a4c50a7d63 (diff) | |
| parent | c15bb3b55faed1a8e5c9913553837539301fbe2e (diff) | |
Merge branch 'blender-v2.83-release'
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_splash_screen.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a3f2d8d7bb..a4037dc1e3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") endif() - -# may as well build python module without a UI -if(WITH_PYTHON_MODULE) - set(WITH_HEADLESS ON) -endif() - if(NOT WITH_PYTHON) set(WITH_CYCLES OFF) set(WITH_DRACO OFF) diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c index 8445fac0498..c821f5bfe89 100644 --- a/source/blender/windowmanager/intern/wm_splash_screen.c +++ b/source/blender/windowmanager/intern/wm_splash_screen.c @@ -129,6 +129,7 @@ static void get_version_string(char *ver, const int max_length) version_cycle_number); } +#ifndef WITH_HEADLESS static void wm_block_splash_image_roundcorners_add(ImBuf *ibuf) { 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) { @@ -219,6 +221,7 @@ static ImBuf *wm_block_splash_image(int width, int *r_height) return ibuf; #else + UNUSED_VARS(width, r_height); return NULL; #endif } |