Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Dobarro <pablodp606@gmail.com>2020-03-09 21:04:37 +0300
committerPablo Dobarro <pablodp606@gmail.com>2020-03-09 21:43:00 +0300
commite702c9a7000bf4096546b876ae6a926acaa8d6ec (patch)
tree647cec9997e15e6e52a4da7b6a65dbcfcbce1c33 /source/blender/editors/sculpt_paint/sculpt.c
parent0030e6a2fc265258be7e02bedb89d81feda2adda (diff)
Fix Cloth Brush not working with automasking
The cloth brush was not using the automasking values when calculating the mask value on each vertex. Reviewed By: brecht Differential Revision: https://developer.blender.org/D7083
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 34d0d9a482b..85a606b4618 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1470,7 +1470,7 @@ static bool sculpt_automasking_enabled(SculptSession *ss, const Brush *br)
return false;
}
-static float sculpt_automasking_factor_get(SculptSession *ss, int vert)
+float SCULPT_automasking_factor_get(SculptSession *ss, int vert)
{
if (ss->cache->automask) {
return ss->cache->automask[vert];
@@ -2255,7 +2255,7 @@ float SCULPT_brush_strength_factor(SculptSession *ss,
avg *= 1.0f - mask;
/* Automasking. */
- avg *= sculpt_automasking_factor_get(ss, vertex_index);
+ avg *= SCULPT_automasking_factor_get(ss, vertex_index);
return avg;
}
@@ -4038,7 +4038,7 @@ static void do_elastic_deform_brush_task_cb_ex(void *__restrict userdata,
mul_v3_fl(final_disp, 1.0f - *vd.mask);
}
- mul_v3_fl(final_disp, sculpt_automasking_factor_get(ss, vd.index));
+ mul_v3_fl(final_disp, SCULPT_automasking_factor_get(ss, vd.index));
copy_v3_v3(proxy[vd.i], final_disp);