archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix RGN_DRAW_REFRESH_UI flag being overwritten

Browse Source
This commit is contained in:
Campbell Barton
2014-07-19 08:11:52 +10:00
parent 78d84d78a1
commit eb7eafbf19
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/screen/area.c
View File

@@ -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) {