Revision: 22753
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22753
Author: kjym3
Date: 2009-08-25 03:12:23 +0200 (Tue, 25 Aug 2009)
Log Message:
-----------
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.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/SConscript
branches/soc-2008-mxcurioni/source/creator/creator.c
Modified: branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt 2009-08-25
00:12:11 UTC (rev 22752)
+++ branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt 2009-08-25
01:12:23 UTC (rev 22753)
@@ -38,6 +38,7 @@
../blender/python
../blender/makesdna
../blender/gpu
+ ../blender/freestyle
../kernel/gen_messaging
../kernel/gen_system
../../extern/glew/include
Modified: branches/soc-2008-mxcurioni/source/creator/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/creator/SConscript 2009-08-25
00:12:11 UTC (rev 22752)
+++ branches/soc-2008-mxcurioni/source/creator/SConscript 2009-08-25
01:12:23 UTC (rev 22753)
@@ -7,6 +7,7 @@
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']
Modified: branches/soc-2008-mxcurioni/source/creator/creator.c
===================================================================
--- branches/soc-2008-mxcurioni/source/creator/creator.c 2009-08-25
00:12:11 UTC (rev 22752)
+++ branches/soc-2008-mxcurioni/source/creator/creator.c 2009-08-25
01:12:23 UTC (rev 22753)
@@ -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 @@
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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
