From cc72dd73760ab41442e4ce7c81bea8697207d27d Mon Sep 17 00:00:00 2001 From: Pablo Dobarro Date: Sun, 18 Apr 2021 18:33:56 +0200 Subject: Fix T87596: Pose brush not using automasking options Automasking cache factors were missing in the pose brush deform function. Reviewed By: JacquesLucke Maniphest Tasks: T87596 Differential Revision: https://developer.blender.org/D11005 --- source/blender/editors/sculpt_paint/sculpt_pose.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/sculpt_paint') diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.c b/source/blender/editors/sculpt_paint/sculpt_pose.c index 4d2a1bf13dc..587ce346428 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.c +++ b/source/blender/editors/sculpt_paint/sculpt_pose.c @@ -197,8 +197,9 @@ static void do_pose_brush_task_cb_ex(void *__restrict userdata, mul_v3_fl(disp, segments[ik].weights[vd.index]); /* Apply the vertex mask to the displacement. */ - float mask = vd.mask ? *vd.mask : 0.0f; - mul_v3_fl(disp, 1.0f - mask); + const float mask = vd.mask ? 1.0f - *vd.mask : 1.0f; + const float automask = SCULPT_automasking_factor_get(ss->cache->automasking, ss, vd.index); + mul_v3_fl(disp, mask * automask); /* Accumulate the displacement. */ add_v3_v3(total_disp, disp); -- cgit v1.2.3