[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29830] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/sculpt.c: minor clean up while looking for why invert isn't working
Tom Musgrove
LetterRip at gmail.com
Wed Jun 30 19:42:44 CEST 2010
Revision: 29830
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29830
Author: letterrip
Date: 2010-06-30 19:42:42 +0200 (Wed, 30 Jun 2010)
Log Message:
-----------
minor clean up while looking for why invert isn't working
Modified Paths:
--------------
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
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-30 17:25:28 UTC (rev 29829)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c 2010-06-30 17:42:42 UTC (rev 29830)
@@ -595,7 +595,7 @@
/* Primary strength input; square it to make lower values more sensitive */
float alpha = brush->alpha * brush->alpha * brush->strength_multiplier;
float dir = brush->flag & BRUSH_DIR_IN ? -1 : 1;
- float pressure = brush->flag & BRUSH_ALPHA_PRESSURE ? cache->pressure : 1;
+ float pressure = brush->flag & BRUSH_ALPHA_PRESSURE ? cache->pressure : 1;
float pen_flip = cache->pen_flip ? -1 : 1;
float invert = cache->invert ? -1 : 1;
float accum = integrate_overlap(brush);
@@ -619,7 +619,7 @@
return alpha * flip * pressure * overlap;
case SCULPT_TOOL_INFLATE:
- if (dir*invert*pen_flip > 0) {
+ if (flip > 0) {
return 0.250f * alpha * flip * pressure * overlap;
}
else {
@@ -629,7 +629,7 @@
case SCULPT_TOOL_FILL:
case SCULPT_TOOL_SCRAPE:
case SCULPT_TOOL_FLATTEN:
- if (dir*invert*pen_flip > 0) {
+ if (flip > 0) {
overlap = (1+overlap) / 2;
return alpha * flip * pressure * overlap;
}
@@ -642,7 +642,7 @@
return alpha * pressure * overlap;
case SCULPT_TOOL_PINCH:
- if (dir*invert*pen_flip > 0) {
+ if (flip > 0) {
return alpha * flip * pressure * overlap;
}
else {
More information about the Bf-blender-cvs
mailing list