Merged changes in the trunk up to revision 41225.
[blender-staging.git] / source / creator / creator.c
index a062021ff7c9da7a6eedd100a50ea47a25cb0b42..96db24a55a52bcad60ecec3c3e3d0f0a98418f21 100644 (file)
@@ -99,6 +99,8 @@
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 
+#include "FRS_freestyle.h"
+
 #ifdef WITH_BUILDINFO_HEADER
 #define BUILD_DATE
 #endif
@@ -1191,7 +1193,7 @@ int main(int argc, const char **argv)
        /* for all platforms, even windos has it! */
        if(G.background) signal(SIGINT, blender_esc);   /* ctrl c out bg render */
 #endif
-
+       
        /* background render uses this font too */
        BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size);
 
@@ -1241,6 +1243,10 @@ int main(int argc, const char **argv)
        CTX_py_init_set(C, 1);
        WM_keymap_init(C);
 
+       /* initialize Freestyle */
+       FRS_initialize();
+       FRS_set_context(C);
+
        /* OK we are ready for it */
        BLI_argsParse(ba, 4, load_file, C);