[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29799] branches/soc-2010-jwilkins: Sculpt Tool selector wasn't working correctly.

Jason Wilkins Jason.A.Wilkins at gmail.com
Tue Jun 29 21:40:29 CEST 2010


Revision: 29799
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29799
Author:   jwilkins
Date:     2010-06-29 21:40:26 +0200 (Tue, 29 Jun 2010)

Log Message:
-----------
Sculpt Tool selector wasn't working correctly.

Modified Paths:
--------------
    branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.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-06-29 19:27:12 UTC (rev 29798)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-06-29 19:40:26 UTC (rev 29799)
@@ -761,7 +761,7 @@
         col = layout.column(align=True)
 
         if context.sculpt_object:
-            col.prop(brush, "sculpt_tool", expand=False)
+            col.prop(brush, "sculpt_tool", expand=False, text="")
         elif context.texture_paint_object:
             col.prop(brush, "imagepaint_tool", expand=True)
             #col.prop_enum(settings, "tool", 'DRAW')

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-06-29 19:27:12 UTC (rev 29798)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-06-29 19:40:26 UTC (rev 29799)
@@ -621,10 +621,10 @@
 		case SCULPT_TOOL_SCRAPE:
 		case SCULPT_TOOL_FLATTEN:
 			if (dir*invert*pen_flip > 0)
-				return alpha * flip * pressure * overlap;
+				return 8.0f * alpha * flip * pressure * overlap;
 			else
 				/* reduce strength for DEEPEN, PEAKS, and CONTRAST */
-				return 0.5f * alpha * flip * pressure * overlap; 
+				return 3.0f * alpha * flip * pressure * overlap; 
 
 		case SCULPT_TOOL_SMOOTH:
 			return alpha * pressure * overlap;

Modified: branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c	2010-06-29 19:27:12 UTC (rev 29798)
+++ branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c	2010-06-29 19:40:26 UTC (rev 29799)
@@ -191,9 +191,9 @@
 
 	prop= RNA_def_property(srna, "sculpt_tool", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, brush_sculpt_tool_items);
-	RNA_def_property_ui_text(prop, "", "");
+	RNA_def_property_ui_text(prop, "Sculpt Tool", "");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
-	
+
 	//prop= RNA_def_property(srna, "stroke_tool", PROP_ENUM, PROP_NONE);
 	//RNA_def_property_enum_items(prop, brush_stroke_tool_items);
 	//RNA_def_property_ui_text(prop, "Stroke Tool", "");





More information about the Bf-blender-cvs mailing list