diff options
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | source/blender/windowmanager/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 8 |
3 files changed, 19 insertions, 0 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 3f5c86857b7..4014d370eb8 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -138,6 +138,13 @@ if(WITH_BUILDINFO) add_definitions(-DWITH_BUILDINFO) endif() +if(WITH_OPENSUBDIV) + add_definitions(-DWITH_OPENSUBDIV) + list(APPEND INC + ../../../intern/opensubdiv + ) +endif() + if(WIN32) if(WITH_INPUT_IME) add_definitions(-DWITH_INPUT_IME) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 912d11762e1..47eee41cf16 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -86,4 +86,8 @@ if env['WITH_BF_PYTHON_SECURITY']: if env['OURPLATFORM'] in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'): defs.append("WITH_X11") +if env['WITH_BF_OPENSUBDIV']: + defs.append("WITH_OPENSUBDIV") + incs += ' #intern/opensubdiv' + env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] ) diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 0515cd01f6f..ad7044c6218 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -117,6 +117,10 @@ #include "BKE_sound.h" #include "COM_compositor.h" +#ifdef WITH_OPENSUBDIV +# include "opensubdiv_capi.h" +#endif + static void wm_init_reports(bContext *C) { ReportList *reports = CTX_wm_reports(C); @@ -525,6 +529,10 @@ void WM_exit_ext(bContext *C, const bool do_python) (void)do_python; #endif +#ifdef WITH_OPENSUBDIV + openSubdiv_cleanup(); +#endif + if (!G.background) { GPU_global_buffer_pool_free(); GPU_free_unused_buffers(); |