[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34988] trunk/blender/source/blender/ windowmanager/intern/wm_draw.c: Bugfix #26009

[Ton Roosendaal]

Revision: 34988
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34988
Author:   ton
Date:     2011-02-19 11:59:01 +0000 (Sat, 19 Feb 2011)
Log Message:
-----------
Bugfix #26009

Paint cursors were drawing on top of pop-up menus in 3D window,
only in triple-buffer mode though.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_draw.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_draw.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_draw.c	2011-02-19 09:53:38 UTC (rev 34987)
+++ trunk/blender/source/blender/windowmanager/intern/wm_draw.c	2011-02-19 11:59:01 UTC (rev 34988)
@@ -560,7 +560,7 @@
 	bScreen *screen= win->screen;
 	ScrArea *sa;
 	ARegion *ar;
-	int copytex= 0;
+	int copytex= 0, paintcursor= 1;
 
 	if(win->drawdata) {
 		glClearColor(0, 0, 0, 0);
@@ -616,6 +616,8 @@
 			CTX_wm_menu_set(C, ar);
 			ED_region_do_draw(C, ar);
 			CTX_wm_menu_set(C, NULL);
+			/* when a menu is being drawn, don't do the paint cursors */
+			paintcursor= 0;
 		}
 	}
 
@@ -623,7 +625,7 @@
 	if(win->gesture.first)
 		wm_gesture_draw(win);
 
-	if(wm->paintcursors.first) {
+	if(paintcursor && wm->paintcursors.first) {
 		for(sa= screen->areabase.first; sa; sa= sa->next) {
 			for(ar=sa->regionbase.first; ar; ar= ar->next) {
 				if(ar->swinid == screen->subwinactive) {