[Bf-blender-cvs] [7bb16a5] master: Fix (unreported) broken background mode of Blender (due to OSD cleanup called also in background mode).

Bastien Montagne noreply at git.blender.org
Tue Nov 10 10:38:57 CET 2015


Commit: 7bb16a5ccf14604b61cb2776147abb7fb6ad6d42
Author: Bastien Montagne
Date:   Tue Nov 10 10:37:52 2015 +0100
Branches: master
https://developer.blender.org/rB7bb16a5ccf14604b61cb2776147abb7fb6ad6d42

Fix (unreported) broken background mode of Blender (due to OSD cleanup called also in background mode).

===================================================================

M	source/blender/windowmanager/intern/wm_init_exit.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index d528b65..94941e9 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -546,11 +546,11 @@ void WM_exit_ext(bContext *C, const bool do_python)
 	(void)do_python;
 #endif
 
+	if (!G.background) {
 #ifdef WITH_OPENSUBDIV
-	BKE_subsurf_osd_cleanup();
+		BKE_subsurf_osd_cleanup();
 #endif
 
-	if (!G.background) {
 		GPU_global_buffer_pool_free();
 		GPU_free_unused_buffers();




More information about the Bf-blender-cvs mailing list