diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-22 14:59:36 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-22 14:59:36 +0300 |
commit | 09b1c681e16575ee82bcc3949728189cb968d927 (patch) | |
tree | 1d16d380f47a8932e59f2aab94d3dda448291e13 /source/blender/windowmanager | |
parent | 1e9bf0cfdb6c925b28af6f0330467e7d9d798c05 (diff) |
Sculpt Mode Bugfixes:
* #20833: layer brush doesn't work with multires.
* #20946: sculpt mode partially removes parts of the mesh in the viewport.
* #20420: grab brush stops after moving some distance.
* #20906: sculpt grab tool moves in wrong direction.
* #21132 and #21272: undo on object with subdivision surface modifier crashes.
* #21115: subsurf + multires + sculpting + undo causes crash.
* #20683: sculpt + multires apply + undo crash.
* #19094: wrong outline in solid mode.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 11 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 5 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 5 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_draw.h | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index b6840af9779..fec46d32a08 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -158,7 +158,7 @@ static void wm_flush_regions_down(bScreen *screen, rcti *dirty) for(sa= screen->areabase.first; sa; sa= sa->next) { for(ar= sa->regionbase.first; ar; ar= ar->next) { if(BLI_isect_rcti(dirty, &ar->winrct, NULL)) { - ar->do_draw= 1; + ar->do_draw= RGN_DRAW; memset(&ar->drawrct, 0, sizeof(ar->drawrct)); ar->swap= WIN_NONE_OK; } @@ -173,7 +173,7 @@ static void wm_flush_regions_up(bScreen *screen, rcti *dirty) for(ar= screen->regionbase.first; ar; ar= ar->next) { if(BLI_isect_rcti(dirty, &ar->winrct, NULL)) { - ar->do_draw= 1; + ar->do_draw= RGN_DRAW; memset(&ar->drawrct, 0, sizeof(ar->drawrct)); ar->swap= WIN_NONE_OK; } @@ -681,6 +681,13 @@ static int wm_automatic_draw_method(wmWindow *win) return win->drawmethod; } +void wm_tag_redraw_overlay(wmWindow *win, ARegion *ar) +{ + /* for draw triple gestures, paint cursors don't need region redraw */ + if(ar && win && wm_automatic_draw_method(win) != USER_DRAW_TRIPLE) + ED_region_tag_redraw(ar); +} + void wm_draw_update(bContext *C) { wmWindowManager *wm= CTX_wm_manager(C); diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 5de01a6259f..d430b0f8a1b 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -71,6 +71,7 @@ #include "wm_window.h" #include "wm_event_system.h" #include "wm_event_types.h" +#include "wm_draw.h" /* ************ event management ************** */ @@ -1460,9 +1461,7 @@ static void wm_paintcursor_tag(bContext *C, wmPaintCursor *pc, ARegion *ar) if(pc->poll == NULL || pc->poll(C)) { wmWindow *win= CTX_wm_window(C); win->screen->do_draw_paintcursor= 1; - - if(win->drawmethod != USER_DRAW_TRIPLE) - ED_region_tag_redraw(ar); + wm_tag_redraw_overlay(win, ar); } } } diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index e26d4dd8473..2365da517e7 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -47,6 +47,7 @@ #include "wm.h" #include "wm_event_system.h" #include "wm_subwindow.h" +#include "wm_draw.h" #include "ED_screen.h" @@ -346,8 +347,8 @@ void wm_gesture_tag_redraw(bContext *C) if(screen) screen->do_draw_gesture= 1; - if(ar && win->drawmethod != USER_DRAW_TRIPLE) - ED_region_tag_redraw(ar); + + wm_tag_redraw_overlay(win, ar); } diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h index 42d3ec7e8bc..762d759c936 100644 --- a/source/blender/windowmanager/wm_draw.h +++ b/source/blender/windowmanager/wm_draw.h @@ -38,5 +38,7 @@ void wm_draw_update (struct bContext *C); void wm_draw_window_clear (struct wmWindow *win); void wm_draw_region_clear (struct wmWindow *win, struct ARegion *ar); +void wm_tag_redraw_overlay (struct wmWindow *win, struct ARegion *ar); + #endif /* WM_DRAW_H */ |