Merge branch 'blender-v3.3-release'

This commit is contained in:
Brecht Van Lommel 2022-08-11 19:28:03 +02:00
commit ef5a44df2d
1 changed files with 9 additions and 11 deletions

View File

@ -1807,20 +1807,21 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
AUD_Sound_free(source);
source = NULL;
#endif
/* we still miss freeing a lot!,
* but many areas could skip initialization too for anim play */
GPU_shader_free_builtin_shaders();
if (g_WS.gpu_context) {
GPU_context_active_set(g_WS.gpu_context);
GPU_context_discard(g_WS.gpu_context);
g_WS.gpu_context = NULL;
}
IMB_exit();
DEG_free_node_types();
BLF_exit();
GPU_exit();
if (g_WS.gpu_context) {
GPU_context_active_set(g_WS.gpu_context);
GPU_exit();
GPU_context_discard(g_WS.gpu_context);
g_WS.gpu_context = NULL;
}
GHOST_DisposeWindow(g_WS.ghost_system, g_WS.ghost_window);
@ -1830,9 +1831,6 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
return filepath;
}
IMB_exit();
DEG_free_node_types();
totblock = MEM_get_memory_blocks_in_use();
if (totblock != 0) {
/* prints many bAKey, bArgument's which are tricky to fix */