Revision: 17788
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17788
Author: ton
Date: 2008-12-11 15:59:57 +0100 (Thu, 11 Dec 2008)
Log Message:
-----------
2.5
Small fix: Screen state updating should be blocked while menus are open.
Caused draw errors for activated headers. Todo is: bring back separation
between window-handlers and screen-handlers, to solve this?
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
2008-12-11 10:36:40 UTC (rev 17787)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2008-12-11 14:59:57 UTC (rev 17788)
@@ -960,6 +960,10 @@
ScrArea *sa;
int oldswin= win->screen->subwinactive;
+ /* XXX prevent this call for modal menus now */
+ if(win->screen->regionbase.first)
+ return;
+
for(sa= win->screen->areabase.first; sa; sa= sa->next) {
if(event->x > sa->totrct.xmin && event->x <
sa->totrct.xmax)
if(event->y > sa->totrct.ymin && event->y <
sa->totrct.ymax)
@@ -986,10 +990,11 @@
if(ar->swinid==oldswin ||
ar->swinid==win->screen->subwinactive)
do_draw= 1;
- if(do_draw)
+ if(do_draw) {
for(ar= sa->regionbase.first; ar; ar=
ar->next)
if(ar->regiontype==RGN_TYPE_HEADER)
ar->do_draw= 1; /* XXX
*/
+ }
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
