[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29914] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/sculpt.c: * I had the stitch mesh code in the wrong place, that is what was causing the weird "cubfication" of the mesh along node boundaries

[Jason Wilkins]

Revision: 29914
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29914
Author:   jwilkins
Date:     2010-07-04 09:52:51 +0200 (Sun, 04 Jul 2010)

Log Message:
-----------
* I had the stitch mesh code in the wrong place, that is what was causing the weird "cubfication" of the mesh along node boundaries

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-04 02:08:39 UTC (rev 29913)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-04 07:52:51 UTC (rev 29914)
@@ -1225,11 +1225,13 @@
 		for(n=0; n<totnode; n++) {
 			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);
 		}
+
+		if(ss->multires)
+			multires_stitch_grids(ss->ob);
 	}
 }
 
@@ -1334,6 +1336,7 @@
 
 				/* first we pinch */
 				sub_v3_v3v3(val1, test.location, vd.co);
+				//mul_v3_v3(val1, ss->cache->scale);
 				mul_v3_fl(val1, fade*flippedbstrength);
 
 				/* then we draw */
@@ -1376,6 +1379,7 @@
 				float val[3];
 
 				sub_v3_v3v3(val, test.location, vd.co);
+				//mul_v3_v3(val, ss->cache->scale);
 				mul_v3_v3fl(proxy[vd.i], val, fade);
 
 				if(vd.mvert) {