Fixed a crash due to a missing call for FRS_initialize in the case
of running Blender in the background rendering mode using the '-b' command option.
This commit is contained in:
@@ -38,6 +38,7 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc
|
||||
../blender/python
|
||||
../blender/makesdna
|
||||
../blender/gpu
|
||||
../blender/freestyle
|
||||
../kernel/gen_messaging
|
||||
../kernel/gen_system
|
||||
../../extern/glew/include
|
||||
|
||||
@@ -7,6 +7,7 @@ incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
|
||||
incs += ' ../blender/include ../blender/blenloader ../blender/imbuf'
|
||||
incs += ' ../blender/renderconverter ../blender/render/extern/include'
|
||||
incs += ' ../blender/python ../blender/makesdna ../kernel/gen_messaging'
|
||||
incs += ' ../blender/freestyle'
|
||||
incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu'
|
||||
incs += ' ' + env['BF_OPENGL_INC']
|
||||
|
||||
|
||||
@@ -81,6 +81,8 @@
|
||||
#include "GPU_draw.h"
|
||||
#include "GPU_extensions.h"
|
||||
|
||||
#include "FRS_freestyle.h"
|
||||
|
||||
#include "playanim_ext.h"
|
||||
#include "mydevice.h"
|
||||
#include "nla.h"
|
||||
@@ -820,6 +822,8 @@ int main(int argc, char **argv)
|
||||
pointcache works */
|
||||
if (retval!=0) G.relbase_valid = 1;
|
||||
|
||||
FRS_initialize();
|
||||
|
||||
/* happens for the UI on file reading too */
|
||||
BKE_reset_undo();
|
||||
BKE_write_undo("original"); /* save current state */
|
||||
|
||||
Reference in New Issue
Block a user