blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T77031: Blender as pymodule crashes when rendering 

No longer enforce WITH_HEADLESS when building as a Python module
as it disables GPU access which is needed for rendering.
This commit is contained in:
Campbell Barton 2020-05-25 15:35:51 +10:00
parent 31f3e9082a
commit c15bb3b55f
Notes: blender-bot 2023-02-14 11:35:46 +01:00 
Referenced by issue #77031, Blender as pymodule segfault
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -608,12 +608,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)

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

@ -164,6 +164,7 @@ static void wm_block_splash_add_labels(uiBlock *block, int x, int y)
#endif /* WITH_BUILDINFO */
}
#ifndef WITH_HEADLESS
static void wm_block_splash_image_roundcorners_add(ImBuf *ibuf)
{
uchar *rct = (uchar *)ibuf->rect;
@ -214,6 +215,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)
{
@ -254,6 +256,7 @@ static ImBuf *wm_block_splash_image(int width, int *r_height)
return ibuf;
#else
UNUSED_VARS(width, r_height);
return NULL;
#endif
}