[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46800] trunk/blender/source/blender/ editors/sculpt_paint/sculpt.c: Fix sculpt layer brush, broken by texture changes in r46651.

Nicholas Bishop nicholasbishop at gmail.com
Sun May 20 01:11:47 CEST 2012


Revision: 46800
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46800
Author:   nicholasbishop
Date:     2012-05-19 23:11:46 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Fix sculpt layer brush, broken by texture changes in r46651.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46651

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2012-05-19 21:22:01 UTC (rev 46799)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2012-05-19 23:11:46 UTC (rev 46800)
@@ -1884,14 +1884,14 @@
 	SculptSession *ss = ob->sculpt;
 	Brush *brush = paint_brush(&sd->paint);
 	float bstrength = ss->cache->bstrength;
-	float area_normal[3], offset[3];
+	float offset[3];
 	float lim = brush->height;
 	int n;
 
 	if (bstrength < 0)
 		lim = -lim;
 
-	mul_v3_v3v3(offset, ss->cache->scale, area_normal);
+	mul_v3_v3v3(offset, ss->cache->scale, ss->cache->sculpt_normal_symm);
 
 	#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
 	for (n = 0; n < totnode; n++) {
@@ -1917,7 +1917,8 @@
 		{
 			if (sculpt_brush_test(&test, origco[vd.i])) {
 				const float fade = bstrength * tex_strength(ss, brush, vd.co, test.dist,
-				                                            area_normal, vd.no, vd.fno, *vd.mask);
+				                                            ss->cache->sculpt_normal_symm,
+															vd.no, vd.fno, *vd.mask);
 				float *disp = &layer_disp[vd.i];
 				float val[3];
 




More information about the Bf-blender-cvs mailing list