Merged changes in the trunk up to revision 36408.
[blender.git] / source / creator / creator.c
index ab94131966f6ed667b2fc320cf0d2acfa2d63a20..4d27928e63eec9d7d7336124398f75dc9a913dba 100644 (file)
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 
+#include "FRS_freestyle.h"
+
 #ifdef WITH_BUILDINFO_HEADER
 #define BUILD_DATE
 #endif
@@ -1237,7 +1239,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);
 
@@ -1285,6 +1287,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);