[Bf-blender-cvs] [5dff243cb1a] temp-sculpt-normals-masking: Merge remote-tracking branch 'origin' into temp-sculpt-normals-masking

[Joseph Eagar]

Commit: 5dff243cb1ad4753186eac62e8b701e458311c5f
Author: Joseph Eagar
Date:   Wed Sep 28 23:08:48 2022 -0700
Branches: temp-sculpt-normals-masking
https://developer.blender.org/rB5dff243cb1ad4753186eac62e8b701e458311c5f

Merge remote-tracking branch 'origin' into temp-sculpt-normals-masking

===================================================================



===================================================================

diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 50e9759f397,54810436d20..c95ddd6e06e
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -3550,7 -3548,8 +3550,8 @@@ static void do_brush_action(Sculpt *sd
      SCULPT_bmesh_topology_rake(sd, ob, nodes, totnode, brush->topology_rake_factor);
    }
  
-   if (!SCULPT_tool_can_reuse_automask(brush->sculpt_tool) || (ss->cache->supports_gravity && sd->gravity_factor > 0.0f)) {
 -  if (!SCULPT_tool_can_reuse_cavity_mask(brush->sculpt_tool) ||
++  if (!SCULPT_tool_can_reuse_automask(brush->sculpt_tool) ||
+       (ss->cache->supports_gravity && sd->gravity_factor > 0.0f)) {
      /* Clear cavity mask cache. */
      ss->last_automasking_settings_hash = 0;
    }
diff --cc source/blender/editors/sculpt_paint/sculpt_paint_color.c
index 05eacef55bc,e717c15d6dc..7946affdec5
--- a/source/blender/editors/sculpt_paint/sculpt_paint_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.c
@@@ -210,11 -195,9 +210,10 @@@ static void do_paint_brush_task_cb_ex(v
          paint_color, paint_color, wet_mix_color, ss->cache->paint_brush.wet_mix);
      blend_color_mix_float(color_buffer->color[vd.i], color_buffer->color[vd.i], paint_color);
  
-     /* Final mix over the original color using brush alpha. We apply automaking again
-      * at this point to avoid washing out non-binary masking modes like cavity masking.
-      */
+     /* Final mix over the original color using brush alpha. We apply auto-making again
+      * at this point to avoid washing out non-binary masking modes like cavity masking. */
 -    float automasking = SCULPT_automasking_factor_get(ss->cache->automasking, ss, vd.vertex);
 +    float automasking = SCULPT_automasking_factor_get(
 +        ss->cache->automasking, ss, vd.vertex, &automask_data);
      mul_v4_v4fl(buffer_color, color_buffer->color[vd.i], brush->alpha * automasking);
  
      float col[4];