diff options
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_brush.h | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 15 |
2 files changed, 3 insertions, 15 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index d48753590bb..42379c02e89 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -66,8 +66,7 @@ void BKE_brush_randomize_texture_coordinates(struct UnifiedPaintSettings *ups, b /* brush curve */ void BKE_brush_curve_preset(struct Brush *b, int preset); -float BKE_brush_curve_strength_clamp(struct Brush *br, float p, const float len); -float BKE_brush_curve_strength(struct Brush *br, float p, const float len); /* used for sculpt */ +float BKE_brush_curve_strength(struct Brush *br, float p, const float len); /* sampling */ float BKE_brush_sample_tex_3D(const Scene *scene, struct Brush *br, const float point[3], diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index cdbcffe0ce4..0a57dc5c945 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -964,7 +964,7 @@ void BKE_brush_randomize_texture_coordinates(UnifiedPaintSettings *ups, bool mas } /* Uses the brush curve control to find a strength value between 0 and 1 */ -float BKE_brush_curve_strength_clamp(Brush *br, float p, const float len) +float BKE_brush_curve_strength(Brush *br, float p, const float len) { float strength; @@ -977,17 +977,6 @@ float BKE_brush_curve_strength_clamp(Brush *br, float p, const float len) return strength; } -/* same as above but can return negative values if the curve enables - * used for sculpt only */ -float BKE_brush_curve_strength(Brush *br, float p, const float len) -{ - if (p >= len) - p = 1.0f; - else - p = p / len; - - return curvemapping_evaluateF(br->curve, 0, p); -} /* TODO: should probably be unified with BrushPainter stuff? */ unsigned int *BKE_brush_gen_texture_cache(Brush *br, int half_side, bool use_secondary) @@ -1045,7 +1034,7 @@ struct ImBuf *BKE_brush_gen_radial_control_imbuf(Brush *br, bool secondary) for (i = 0; i < side; ++i) { for (j = 0; j < side; ++j) { float magn = sqrtf(pow2f(i - half) + pow2f(j - half)); - im->rect_float[i * side + j] = BKE_brush_curve_strength_clamp(br, magn, half); + im->rect_float[i * side + j] = BKE_brush_curve_strength(br, magn, half); } } |