[Bf-blender-cvs] [8a6c6a5dc51] master: Cleanup: Remove unused functions in sculpt automasking code

Joseph Eagar noreply at git.blender.org
Fri Jan 20 02:30:50 CET 2023


Commit: 8a6c6a5dc5189e41348943749eef5aa30434d046
Author: Joseph Eagar
Date:   Thu Jan 19 17:30:17 2023 -0800
Branches: master
https://developer.blender.org/rB8a6c6a5dc5189e41348943749eef5aa30434d046

Cleanup: Remove unused functions in sculpt automasking code

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

M	source/blender/editors/sculpt_paint/sculpt_automasking.cc

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

diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
index dcd8a72eb51..3edc99d32c1 100644
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
@@ -585,19 +585,6 @@ void SCULPT_automasking_cache_free(AutomaskingCache *automasking)
   MEM_SAFE_FREE(automasking);
 }
 
-static bool sculpt_automasking_is_constrained_by_radius(Brush *br)
-{
-  /* 2D falloff is not constrained by radius. */
-  if (br->falloff_shape == PAINT_FALLOFF_SHAPE_TUBE) {
-    return false;
-  }
-
-  if (ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_THUMB, SCULPT_TOOL_ROTATE)) {
-    return true;
-  }
-  return false;
-}
-
 struct AutomaskFloodFillData {
   float radius;
   bool use_radius;
@@ -605,18 +592,6 @@ struct AutomaskFloodFillData {
   char symm;
 };
 
-static bool automask_floodfill_cb(
-    SculptSession *ss, PBVHVertRef from_v, PBVHVertRef to_v, bool /*is_duplicate*/, void *userdata)
-{
-  AutomaskFloodFillData *data = (AutomaskFloodFillData *)userdata;
-
-  *(float *)SCULPT_vertex_attr_get(to_v, ss->attrs.automasking_factor) = 1.0f;
-  *(float *)SCULPT_vertex_attr_get(from_v, ss->attrs.automasking_factor) = 1.0f;
-  return (!data->use_radius ||
-          SCULPT_is_vertex_inside_brush_radius_symm(
-              SCULPT_vertex_co_get(ss, to_v), data->location, data->radius, data->symm));
-}
-
 static void sculpt_face_sets_automasking_init(Sculpt *sd, Object *ob)
 {
   SculptSession *ss = ob->sculpt;



More information about the Bf-blender-cvs mailing list