[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30295] branches/soc-2010-jwilkins: * changed default pinch factor 0.5f

[Jason Wilkins]

Revision: 30295
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30295
Author:   jwilkins
Date:     2010-07-14 09:35:26 +0200 (Wed, 14 Jul 2010)

Log Message:
-----------
* changed default pinch factor 0.5f
* changed control for pinch factor to simply read 'Pinch'

Modified Paths:
--------------
    branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-14 07:23:04 UTC (rev 30294)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-14 07:35:26 UTC (rev 30295)
@@ -624,7 +624,7 @@
                 col.separator()
 
                 row = col.row(align=True)
-                row.prop(brush, "crease_pinch_factor", slider=True)
+                row.prop(brush, "crease_pinch_factor", slider=True, "Pinch")
 
             if brush.sculpt_tool not in ('PINCH', 'INFLATE', 'SMOOTH'):
                 row = col.row(align=True)

Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c	2010-07-14 07:23:04 UTC (rev 30294)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c	2010-07-14 07:35:26 UTC (rev 30295)
@@ -74,7 +74,7 @@
 	brush->size= 35; /* radius of the brush in pixels */
 	brush->alpha= 0.5f; /* brush strength/intensity probably variable should be renamed? */
 	brush->autosmooth_factor= 0.0f;
-	brush->crease_pinch_factor= 2.0f/3.0f;
+	brush->crease_pinch_factor= 0.5f;
 	brush->sculpt_plane = SCULPT_DISP_DIR_VIEW;
 	brush->plane_offset= 0.0f; /* how far above or below the plane that is found by averaging the faces */
 	brush->plane_trim= 0.5f;

Modified: branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c	2010-07-14 07:23:04 UTC (rev 30294)
+++ branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c	2010-07-14 07:35:26 UTC (rev 30295)
@@ -10985,7 +10985,7 @@
 
 			// same as draw brush
 			if (brush->crease_pinch_factor == 0)
-				brush->crease_pinch_factor = 2.0f/3.0f;
+				brush->crease_pinch_factor = 0.5f;
 
 			// will sculpt no vertexes
 			if (brush->plane_trim == 0)