[Bf-blender-cvs] [eb7eafb] master: Fix RGN_DRAW_REFRESH_UI flag being overwritten

Campbell Barton noreply at git.blender.org
Sat Jul 19 00:14:09 CEST 2014


Commit: eb7eafbf19b58be7b48f69cad45009a55c0ade6a
Author: Campbell Barton
Date:   Sat Jul 19 08:11:52 2014 +1000
https://developer.blender.org/rBeb7eafbf19b58be7b48f69cad45009a55c0ade6a

Fix RGN_DRAW_REFRESH_UI flag being overwritten

===================================================================

M	source/blender/editors/screen/area.c

===================================================================

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 400dd6f..d1375b1 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) {




More information about the Bf-blender-cvs mailing list