diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
| commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
| tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blender/python/intern | |
| parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) | |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blender/python/intern')
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy.c | 6 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_app_build_options.c | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index b2ce33b08c7..8f90a823668 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -35,7 +35,6 @@ set(INC ../../makesrna ../../windowmanager ../../../../intern/cycles/blender - ../../freestyle/intern/python ../../../../intern/guardedalloc ) @@ -140,6 +139,13 @@ if(WITH_CYCLES_OSL) add_definitions(-DWITH_CYCLES_OSL) endif() +if(WITH_FREESTYLE) + list(APPEND INC + ../../freestyle/intern/python + ) + add_definitions(-DWITH_FREESTYLE) +endif() + if(WITH_GAMEENGINE) add_definitions(-DWITH_GAMEENGINE) endif() diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index b0dd8a29fbe..4f932ac68ff 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -60,7 +60,9 @@ #include "../generic/blf_py_api.h" #include "../mathutils/mathutils.h" -#include "BPy_Freestyle.h" +#ifdef WITH_FREESTYLE +# include "BPy_Freestyle.h" +#endif PyObject *bpy_package_py = NULL; @@ -259,7 +261,9 @@ void BPy_init_modules(void) } /* stand alone utility modules not related to blender directly */ IDProp_Init_Types(); /* not actually a submodule, just types */ +#ifdef WITH_FREESTYLE Freestyle_Init(); +#endif mod = PyModule_New("_bpy"); diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c index 607613b592c..74df3ef7307 100644 --- a/source/blender/python/intern/bpy_app_build_options.c +++ b/source/blender/python/intern/bpy_app_build_options.c @@ -72,6 +72,10 @@ static PyObject *make_build_options(void) SetStrItem("CYCLES_OSL"); #endif +#ifdef WITH_FREESTYLE + SetStrItem("FREESTYLE"); +#endif + #ifdef WITH_GAMEENGINE SetStrItem("GAMEENGINE"); #endif |