[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55817] trunk/blender/source/blender/ windowmanager/intern/wm_draw.c: Keep brush overlays below panels in triple buffer mode.
Antony Riakiotakis
kalast at gmail.com
Fri Apr 5 18:34:27 CEST 2013
Revision: 55817
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55817
Author: psy-fi
Date: 2013-04-05 16:34:27 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
Keep brush overlays below panels in triple buffer mode.
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 2013-04-05 16:27:39 UTC (rev 55816)
+++ trunk/blender/source/blender/windowmanager/intern/wm_draw.c 2013-04-05 16:34:27 UTC (rev 55817)
@@ -628,6 +628,26 @@
wm_triple_copy_textures(win, triple);
}
+ 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 && ar->swinid == screen->subwinactive) {
+ CTX_wm_area_set(C, sa);
+ CTX_wm_region_set(C, ar);
+
+ /* make region ready for draw, scissor, pixelspace */
+ ED_region_set(C, ar);
+ wm_paintcursor_draw(C, ar);
+
+ CTX_wm_region_set(C, NULL);
+ CTX_wm_area_set(C, NULL);
+ }
+ }
+ }
+
+ wmSubWindowSet(win, screen->mainwin);
+ }
+
/* draw overlapping area regions (always like popups) */
for (sa = screen->areabase.first; sa; sa = sa->next) {
CTX_wm_area_set(C, sa);
@@ -662,26 +682,6 @@
/* always draw, not only when screen tagged */
if (win->gesture.first)
wm_gesture_draw(win);
-
- 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 && ar->swinid == screen->subwinactive) {
- CTX_wm_area_set(C, sa);
- CTX_wm_region_set(C, ar);
-
- /* make region ready for draw, scissor, pixelspace */
- ED_region_set(C, ar);
- wm_paintcursor_draw(C, ar);
-
- CTX_wm_region_set(C, NULL);
- CTX_wm_area_set(C, NULL);
- }
- }
- }
-
- wmSubWindowSet(win, screen->mainwin);
- }
/* needs pixel coords in screen */
if (wm->drags.first) {
More information about the Bf-blender-cvs
mailing list