diff options
author | Ton Roosendaal <ton@blender.org> | 2009-07-19 16:15:20 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-07-19 16:15:20 +0400 |
commit | f72018ebeb841c9aa677b4f51e1d28a56e8565a7 (patch) | |
tree | f88b68bd059ab3ba981df939fe1bd06aa73b9134 /source/blender/windowmanager | |
parent | 26ec00d567520d9c2a5f99e4884ebc0cd63a6656 (diff) |
2.5
Small fix: Triple Buffer mode didn't clip custom paint cursors correctly
for overlapping regions (example, view3d paint circle drawing into toolbar)
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index ef89b2b35ad..1df567e3c92 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -574,8 +574,8 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win) CTX_wm_area_set(C, sa); CTX_wm_region_set(C, ar); - wmSubWindowSet(win, ar->swinid); - ED_region_pixelspace(ar); + /* make region ready for draw, scissor, pixelspace */ + ED_region_set(C, ar); wm_paintcursor_draw(C, ar); CTX_wm_region_set(C, NULL); diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index c899d1d290e..05471329f32 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -236,7 +236,7 @@ static void wm_gesture_draw_cross(wmWindow *win, wmGesture *gt) glDisable(GL_LINE_STIPPLE); } -/* called in wm_event_system.c */ +/* called in wm_draw.c */ void wm_gesture_draw(wmWindow *win) { wmGesture *gt= (wmGesture *)win->gesture.first; |