Merged changes in the trunk up to revision 46045.

[blender-staging.git] / source / blender / python / intern / bpy.c

diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 834ca1227b5ef34060efd0e6b5c0e2d6af50a1e7..fa45b54062ab9ded08625814873b1c6fe709a693 100644 (file)
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -58,6 +58,8 @@
 #include "../generic/blf_py_api.h"
 #include "../mathutils/mathutils.h"
 
+#include "BPy_Freestyle.h"
+
 PyObject *bpy_package_py = NULL;
 
 PyDoc_STRVAR(bpy_script_paths_doc,
@@ -227,7 +229,7 @@ static PyObject *bpy_import_test(const char *modname)
        else {
                PyErr_Print();
                PyErr_Clear();
-       }
+       }       
 
        return mod;
 }
@@ -256,6 +258,7 @@ void BPy_init_modules(void)
        }
        /* stand alone utility modules not related to blender directly */
        IDProp_Init_Types(); /* not actually a submodule, just types */
+       Freestyle_Init();
 
        mod = PyModule_New("_bpy");