diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-25 05:12:23 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-25 05:12:23 +0400 |
| commit | ed4669df0c819a5538bfb95dbc1a57bc8ca436b6 (patch) | |
| tree | f57f3a015fb1cc828f82f237f8bd14968f1c47f7 /source | |
| parent | 008a6cc1eccc9996978321a6abe9e53964a79368 (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/creator/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/creator/SConscript | 1 | ||||
| -rw-r--r-- | source/creator/creator.c | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index e84d1aac3a7..fe2f073e5f9 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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 diff --git a/source/creator/SConscript b/source/creator/SConscript index 16556643707..9720e350337 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -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'] diff --git a/source/creator/creator.c b/source/creator/creator.c index 872a5f4d497..94fccb77528 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -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 */ |