diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-07-19 02:11:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-19 02:11:52 +0400 |
| commit | eb7eafbf19b58be7b48f69cad45009a55c0ade6a (patch) | |
| tree | 7a488a11985f6cdd425e11645b4146bb5325be9e | |
| parent | 78d84d78a1a90e50e152c738d57f83f3c9f3a3e8 (diff) | |
Fix RGN_DRAW_REFRESH_UI flag being overwritten
| -rw-r--r-- | source/blender/editors/screen/area.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 400dd6fc28e..d1375b1b8ab 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -472,8 +472,8 @@ void ED_region_tag_redraw(ARegion *ar) * but python scripts can cause this to happen indirectly */ if (ar && !(ar->do_draw & RGN_DRAWING)) { /* zero region means full region redraw */ - ar->do_draw &= ~RGN_DRAW_PARTIAL; /* just incase */ - ar->do_draw = RGN_DRAW; + ar->do_draw &= ~RGN_DRAW_PARTIAL; + ar->do_draw |= RGN_DRAW; memset(&ar->drawrct, 0, sizeof(ar->drawrct)); } } @@ -494,9 +494,9 @@ void ED_region_tag_refresh_ui(ARegion *ar) void ED_region_tag_redraw_partial(ARegion *ar, rcti *rct) { if (ar && !(ar->do_draw & RGN_DRAWING)) { - if (!ar->do_draw) { + if (!(ar->do_draw & RGN_DRAW)) { /* no redraw set yet, set partial region */ - ar->do_draw = RGN_DRAW_PARTIAL; + ar->do_draw |= RGN_DRAW_PARTIAL; ar->drawrct = *rct; } else if (ar->drawrct.xmin != ar->drawrct.xmax) { |