[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29918] branches/soc-2010-jwilkins: * removed 'strength pressure' button for snake hook brush
Jason Wilkins
Jason.A.Wilkins at gmail.com
Sun Jul 4 11:22:02 CEST 2010
Revision: 29918
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29918
Author: jwilkins
Date: 2010-07-04 11:22:02 +0200 (Sun, 04 Jul 2010)
Log Message:
-----------
* removed 'strength pressure' button for snake hook brush
Modified Paths:
--------------
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.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-04 09:13:00 UTC (rev 29917)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py 2010-07-04 09:22:02 UTC (rev 29918)
@@ -572,7 +572,7 @@
- if brush.sculpt_tool not in ('THUMB', 'SNAKE_HOOK', 'GRAB', 'ROTATE'):
+ if brush.sculpt_tool not in ('SNAKE_HOOK', 'GRAB', 'ROTATE'):
col.separator()
#row = col.row(align=True)
@@ -598,14 +598,8 @@
row = col.row()
row.prop(brush, "strength_multiplier", slider=True)
- elif brush.sculpt_tool in ('THUMB', 'SNAKE_HOOK'):
- col.separator()
- row = col.row()
- row.prop(brush, "use_strength_pressure", toggle=True, text="Strength Pressure")
-
-
# XXX - TODO
#col.separator()
#row = col.row(align=True)
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 09:13:00 UTC (rev 29917)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c 2010-07-04 09:22:02 UTC (rev 29918)
@@ -652,10 +652,10 @@
return alpha * pressure * overlap;
case SCULPT_TOOL_THUMB:
- return pressure / 4;
+ return alpha*pressure / 4;
case SCULPT_TOOL_SNAKE_HOOK:
- return pressure;
+ return 1.0f;
case SCULPT_TOOL_GRAB:
case SCULPT_TOOL_ROTATE:
More information about the Bf-blender-cvs
mailing list