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>2021-04-18 19:33:56 +0300
committerPablo Dobarro <pablodp606@gmail.com>2021-04-27 22:38:06 +0300
commitcc72dd73760ab41442e4ce7c81bea8697207d27d (patch)
treeaeb0da5513f96ccc0a5a230639fbb81fba1b1b61
parentaede740c8afdd2d5f075ee5f7f3f63ae0d6ce723 (diff)
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
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_pose.c5
1 files changed, 3 insertions, 2 deletions
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);