[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29885] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/sculpt.c: * put multires_stitch_grids back to happening every iteration of smooth

[Jason Wilkins]

Revision: 29885
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29885
Author:   jwilkins
Date:     2010-07-03 04:39:25 +0200 (Sat, 03 Jul 2010)

Log Message:
-----------
* put multires_stitch_grids back to happening every iteration of smooth

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-03 00:43:58 UTC (rev 29884)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-03 02:39:25 UTC (rev 29885)
@@ -1223,8 +1223,10 @@
 	for(iteration = 1; iteration <= count; ++iteration) {
 		#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
 		for(n=0; n<totnode; n++) {
-			if(ss->multires)
+			if(ss->multires) {
 				do_multires_smooth_brush(sd, ss, nodes[n], iteration != count ? 1.0f : last);
+				multires_stitch_grids(ss->ob);
+			}
 			else if(ss->fmap)
 				do_mesh_smooth_brush(sd, ss, nodes[n], iteration != count ? 1.0f : last);
 		}
@@ -2527,9 +2529,6 @@
 
 	sculpt_combine_proxies(sd, ss);
 
-	if ((brush->autosmooth_factor > 0 || brush->sculpt_tool == SCULPT_TOOL_SMOOTH) && ss->multires)
-		multires_stitch_grids(ss->ob);
-
 	cache->first_time= 0;
 }