[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30191] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/sculpt.c: * revert redraw fix.

Jason Wilkins Jason.A.Wilkins at gmail.com
Sat Jul 10 23:47:40 CEST 2010


Revision: 30191
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30191
Author:   jwilkins
Date:     2010-07-10 23:47:40 +0200 (Sat, 10 Jul 2010)

Log Message:
-----------
* revert redraw fix.  making redraw region larger violated assumptions in pbvh about what nodes need to be redraw and caused artifacts

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-10 21:15:10 UTC (rev 30190)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-10 21:47:40 UTC (rev 30191)
@@ -3303,7 +3303,6 @@
 	SculptSession *ss = ob->sculpt;
 	ARegion *ar = CTX_wm_region(C);
 	MultiresModifierData *mmd = ss->multires;
-	int redraw = 0;
 
 	if(mmd)
 		multires_mark_as_modified(ob);
@@ -3313,24 +3312,24 @@
 		ED_region_tag_redraw(ar);
 	}
 	else {
-		rcti tmp;
 		rcti r;
 
 		BLI_pbvh_update(ss->pbvh, PBVH_UpdateBB, NULL);
-		redraw = sculpt_get_redraw_rect(ar, CTX_wm_region_view3d(C), ob, &r);
 
-		if(redraw) {
+		if (sculpt_get_redraw_rect(ar, CTX_wm_region_view3d(C), ob, &r)) {
+			//rcti tmp;
+
 			r.xmin += ar->winrct.xmin + 1;
 			r.xmax += ar->winrct.xmin - 1;
 			r.ymin += ar->winrct.ymin + 1;
 			r.ymax += ar->winrct.ymin - 1;
 
-			tmp = r;
+			//tmp = r;
 
-			if (!BLI_rcti_is_empty(&ss->previous_r))
-				BLI_union_rcti(&r, &ss->previous_r);
+			//if (!BLI_rcti_is_empty(&ss->previous_r))
+			//	BLI_union_rcti(&r, &ss->previous_r);
 
-			ss->previous_r = tmp;
+			//ss->previous_r= tmp;
 
 			ss->partial_redraw = 1;
 			ED_region_tag_redraw_partial(ar, &r);




More information about the Bf-blender-cvs mailing list