[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17922] branches/blender2.5/blender/source /blender: 2.5

[Ton Roosendaal]

Revision: 17922
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17922
Author:   ton
Date:     2008-12-18 15:53:39 +0100 (Thu, 18 Dec 2008)

Log Message:
-----------
2.5

- WM subwindows now get freed on every ED_region_exit(). Was not
  a leak, but it's cleaner this way (and saves some kilobytes!).
- fixed debug print for operators (on blender -d) to print correct
  subwindow id.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2008-12-18 11:25:17 UTC (rev 17921)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2008-12-18 14:53:39 UTC (rev 17922)
@@ -1020,6 +1020,10 @@
 
 	CTX_wm_region_set(C, ar);
 	WM_event_remove_handlers(C, &ar->handlers);
+	if(ar->swinid)
+		wm_subwindow_close(CTX_wm_window(C), ar->swinid);
+	ar->swinid= 0;
+	
 	CTX_wm_region_set(C, prevar);
 }
 

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c	2008-12-18 11:25:17 UTC (rev 17921)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c	2008-12-18 14:53:39 UTC (rev 17922)
@@ -568,7 +568,7 @@
 				for(kmi= handler->keymap->first; kmi; kmi= kmi->next) {
 					if(wm_eventmatch(event, kmi)) {
 						if((G.f & G_DEBUG) && event->type!=MOUSEMOVE)
-							printf("handle evt %d win %d op %s\n", event->type, CTX_wm_window(C)->winid, kmi->idname); 
+							printf("handle evt %d win %d op %s\n", event->type, CTX_wm_screen(C)->subwinactive, kmi->idname); 
 						
 						event->keymap_idname= kmi->idname;	/* weak, but allows interactive callback to not use rawkey */