Revision: 18378
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18378
Author: ton
Date: 2009-01-06 20:49:45 +0100 (Tue, 06 Jan 2009)
Log Message:
-----------
2.5
Small context bug when switching screens, Context didn't get updated
well. (solves crash in windows, on exit full screen file browser)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
Modified:
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2009-01-06 19:41:57 UTC (rev 18377)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2009-01-06 19:49:45 UTC (rev 18378)
@@ -1204,17 +1204,19 @@
}
if (oldscreen != sc) {
+ wmWindow *win= CTX_wm_window(C);
wmTimer *wt= oldscreen->animtimer;
/* we put timer to sleep, so screen_exit has to think there's
no timer */
oldscreen->animtimer= NULL;
if(wt)
- WM_event_window_timer_sleep(CTX_wm_window(C), wt, 1);
+ WM_event_window_timer_sleep(win, wt, 1);
- ED_screen_exit(C, CTX_wm_window(C), oldscreen);
+ ED_screen_exit(C, win, oldscreen);
oldscreen->animtimer= wt;
- CTX_wm_window(C)->screen= sc;
+ win->screen= sc;
+ CTX_wm_window_set(C, win); // stores C->wm.screen... hrmf
ED_screen_refresh(CTX_wm_manager(C), CTX_wm_window(C));
WM_event_add_notifier(C, NC_WINDOW, NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
