Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix #26009

Browse Source 
Paint cursors were drawing on top of pop-up menus in 3D window,
only in triple-buffer mode though.
This commit is contained in:
Ton Roosendaal
2011-02-19 11:59:01 +00:00
parent 863ac9e07f
commit 48f232df73
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/windowmanager/intern/wm_draw.c
View File

@@ -560,7 +560,7 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win)
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 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win)
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 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win)
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) {