[Bf-blender-cvs] [c88597a7c59] temp-sculpt-brush-channel: Merge branch 'master' into temp-sculpt-brush-channel

[Joseph Eagar]

Commit: c88597a7c595ee30b64f172b0df94f9a28e7c838
Author: Joseph Eagar
Date:   Sun Nov 13 19:24:44 2022 -0800
Branches: temp-sculpt-brush-channel
https://developer.blender.org/rBc88597a7c595ee30b64f172b0df94f9a28e7c838

Merge branch 'master' into temp-sculpt-brush-channel

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



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

diff --cc source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
index 7986a58a85c,d6c4d43d5fc..8c22d50b542
--- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
@@@ -76,14 -76,12 +76,14 @@@ namespace blender::ed::sculpt_paint 
  using blender::bke::CurvesGeometry;
  
  /* -------------------------------------------------------------------- */
- /** \name * SCULPT_CURVES_OT_brush_stroke
+ /** \name Brush Stroke Operator
   * \{ */
  
 -float brush_radius_factor(const Brush &brush, const StrokeExtension &stroke_extension)
 +float brush_radius_factor(const Scene &scene,
 +                          const Brush &brush,
 +                          const StrokeExtension &stroke_extension)
  {
 -  if (BKE_brush_use_size_pressure(&brush)) {
 +  if (BKE_brush_use_size_pressure(&scene, &brush)) {
      return stroke_extension.pressure;
    }
    return 1.0f;