[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31359] branches/soc-2010-jwilkins/source/ blender: * Fix: clay strips brush was exploding

Jason Wilkins Jason.A.Wilkins at gmail.com
Mon Aug 16 02:55:23 CEST 2010


Revision: 31359
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31359
Author:   jwilkins
Date:     2010-08-16 02:55:23 +0200 (Mon, 16 Aug 2010)

Log Message:
-----------
* Fix: clay strips brush was exploding
* Fix: was initializing front face angle using degrees instead of radians

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

Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c	2010-08-15 22:08:49 UTC (rev 31358)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c	2010-08-16 00:55:23 UTC (rev 31359)
@@ -98,7 +98,7 @@
 
 	brush->adaptive_space_factor= 1;
 
-	brush->frontface_angle= 80;
+	brush->frontface_angle= (float)(M_PI_2 * 80.0/90.0);
 
 	/* BRUSH TEXTURE SETTINGS */
 	default_mtex(&brush->mtex);

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-08-15 22:08:49 UTC (rev 31358)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-08-16 00:55:23 UTC (rev 31359)
@@ -515,7 +515,7 @@
 static float overlapped_curve(Brush* br, float x)
 {
 	int i;
-	const int n = 100 / (br->adaptive_space_factor*br->spacing);
+	const int n = 100 / ((br->flag&BRUSH_ADAPTIVE_SPACE ? br->adaptive_space_factor : 1.0f)  *  br->spacing);
 	const float h = br->spacing / 50.0f;
 	const float x0 = x-1;
 
@@ -2423,7 +2423,7 @@
 
 	int flip;
 
-	calc_sculpt_plane(sd, ss, nodes, totnode, brush->sculpt_plane_range, an, fc);
+	calc_sculpt_plane(sd, ss, nodes, totnode, brush->sculpt_plane_range, sn, fc);
 
 	set_brush_local_mat(sd, ss, brush, NULL, 0, sn);
 





More information about the Bf-blender-cvs mailing list