diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-08-13 14:56:36 +0400 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-08-13 14:56:36 +0400 |
| commit | e28fcec04201fb3be19960a0b91fcb20f8d6c56d (patch) | |
| tree | dffeb25323ad214ac86f6b4cb0d126d729643eba /source/blender/windowmanager | |
| parent | 64e0202314531f2435d518f522b8f06e956c2f3d (diff) | |
Fix for [#32220] regression - DistortionCache is never freed.
* at max 10 cache items will be available. Items will be removed by
latest usage.
* number of cached items can be adjusted in code
* added deinitialization of compositor when blender exists.
* updated scons and cmake build files
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index f44ec2f5dc8..a73d33e6b66 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -36,6 +36,8 @@ set(INC ../makesdna ../makesrna ../nodes + ../compositor + ../opencl ../render/extern/include ../../gameengine/BlenderRoutines ../../../intern/elbeem/extern diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index bf219bb9c06..68fdbec2cfa 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -10,7 +10,7 @@ sources = env.Glob('intern/*.c') incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel' incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include' incs += ' ../radiosity/extern/include' -incs += ' ../makesrna ../gpu ../blenfont ../bmesh' +incs += ' ../makesrna ../gpu ../blenfont ../bmesh ../compositor' incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' incs += ' #/intern/elbeem #/extern/glew/include' diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index ac9b44fddb0..9047532c92c 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -113,6 +113,7 @@ #include "BKE_depsgraph.h" #include "BKE_sound.h" +#include "COM_compositor.h" static void wm_init_reports(bContext *C) { @@ -211,7 +212,6 @@ void WM_init(bContext *C, int argc, const char **argv) #ifdef WITH_COMPOSITOR if (1) { extern void *COM_linker_hack; - extern void *COM_execute; COM_linker_hack = COM_execute; } #endif @@ -414,6 +414,10 @@ void WM_exit_ext(bContext *C, const short do_python) BKE_sequencer_free_clipboard(); /* sequencer.c */ BKE_tracking_clipboard_free(); +#ifdef WITH_COMPOSITOR + COM_deinitialize(); +#endif + free_blender(); /* blender.c, does entire library and spacetypes */ // free_matcopybuf(); free_anim_copybuf(); |