diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-08 18:27:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-08 18:27:28 +0300 |
| commit | 92786141159430fa36e59e0229e4bbb84f2f04be (patch) | |
| tree | dd93e8f2a611ecbbc05646533798e97354d0f34e /source/blender/python | |
| parent | bdc708762cf0fe0490bee3cf8452446da46d342a (diff) | |
| parent | e0597baed57fa7a9dfaf6dff6d0fa120784d21ea (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_app_build_options.c | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 41018468695..a71478cdb15 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -248,10 +248,6 @@ if(WITH_LIBMV) add_definitions(-DWITH_LIBMV) endif() -if(WITH_MOD_BOOLEAN) - add_definitions(-DWITH_MOD_BOOLEAN) -endif() - if(WITH_MOD_FLUID) add_definitions(-DWITH_MOD_FLUID) endif() diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c index 501e09dd6ad..d5c325e4317 100644 --- a/source/blender/python/intern/bpy_app_build_options.c +++ b/source/blender/python/intern/bpy_app_build_options.c @@ -58,7 +58,6 @@ static PyStructSequence_Field app_builtopts_info_fields[] = { {(char *)"sdl_dynload", NULL}, {(char *)"jack", NULL}, {(char *)"libmv", NULL}, - {(char *)"mod_boolean", NULL}, {(char *)"mod_fluid", NULL}, {(char *)"mod_oceansim", NULL}, {(char *)"mod_remesh", NULL}, @@ -237,12 +236,6 @@ static PyObject *make_builtopts_info(void) SetObjIncref(Py_False); #endif -#ifdef WITH_MOD_BOOLEAN - SetObjIncref(Py_True); -#else - SetObjIncref(Py_False); -#endif - #ifdef WITH_MOD_FLUID SetObjIncref(Py_True); #else |