[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25122] trunk/blender/source/blender: This commit deletes temporary "temp" screen layouts when the windows using them get closed.
Joshua Leung
aligorith at gmail.com
Fri Dec 4 10:58:06 CET 2009
Revision: 25122
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25122
Author: aligorith
Date: 2009-12-04 10:58:00 +0100 (Fri, 04 Dec 2009)
Log Message:
-----------
This commit deletes temporary "temp" screen layouts when the windows using them get closed.
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c 2009-12-04 06:33:01 UTC (rev 25121)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c 2009-12-04 09:58:00 UTC (rev 25122)
@@ -1124,6 +1124,12 @@
/* mark it available for use for other windows */
screen->winid= 0;
+ /* if temp screen, delete it */
+ if(screen->full == SCREENTEMP) {
+ Main *bmain= CTX_data_main(C);
+ free_libblock(&bmain->screen, screen);
+ }
+
CTX_wm_window_set(C, prevwin);
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c 2009-12-04 06:33:01 UTC (rev 25121)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c 2009-12-04 09:58:00 UTC (rev 25122)
@@ -233,7 +233,7 @@
CTX_wm_window_set(C, win); /* needed by handlers */
WM_event_remove_handlers(C, &win->handlers);
WM_event_remove_handlers(C, &win->modalhandlers);
- ED_screen_exit(C, win, win->screen);
+ ED_screen_exit(C, win, win->screen); /* will free the current screen if it is a temp layout */
wm_window_free(C, wm, win);
/* check remaining windows */
More information about the Bf-blender-cvs
mailing list