Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/python')
-rw-r--r--source/blender/python/SConscript1
-rw-r--r--source/blender/python/intern/CMakeLists.txt1
-rw-r--r--source/blender/python/intern/bpy.c5
3 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 012bc279cfb..b0164d24852 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -6,6 +6,7 @@ Import ('env')
incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes'
incs += ' ../imbuf ../blenloader ../bmesh ../gpu ../render/extern/include ../windowmanager'
+incs += ' ../freestyle/intern/python'
incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include #intern/cycles/blender'
incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 05583e133dc..4b397ee1870 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -34,6 +34,7 @@ set(INC
../../makesrna
../../windowmanager
../../gpu
+ ../../freestyle/intern/python
../../../../intern/guardedalloc
../../../../intern/cycles/blender
)
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 4d5c02dad68..5511673481e 100644
--- 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");