Weight bleed power works as expected now, factor reverted to distance

Author: greisane

mesh/helpers.py

@@ -415,16 +415,14 @@ def unsubdivide_preserve_uvs(obj, levels):
     bm.free()
 
 def bmesh_vertex_group_bleed(bm, vertex_group_index, distance, power=1.0, only_tagged=False):
-    # TODO Power as a parameter isn't very intuitive
-
-    if distance <= 0.0:
+    if distance <= 0.0 or power <= 0.0:
         return
 
     deform_layer = bm.verts.layers.deform.verify()
     def get_weight(vert):
-        return vert[deform_layer].get(vertex_group_index, 0.0)
+        return vert[deform_layer].get(vertex_group_index, 0.0) ** power
     def set_weight(vert, value):
-        vert[deform_layer][vertex_group_index] = value
+        vert[deform_layer][vertex_group_index] = value ** (1.0 / power)
 
     openset = heapdict()
     for vert in bm.verts:
@@ -441,7 +439,6 @@ def set_weight(vert, value):
                 continue
             other_vert_w = -w - (edge.calc_length() / distance)
             if other_vert_w > 0.0:
-                other_vert_w **= power
                 other_vert_old_w = get_weight(other_vert)
                 if other_vert_w > other_vert_old_w:
                     if other_vert_old_w > 0.0:

mesh/vertex_group_bleed.py

@@ -22,17 +22,18 @@ class GRET_OT_vertex_group_bleed(bpy.types.Operator):
         description="Subset of vertex groups to modify",
         default='ACTIVE',
     )
-    factor: bpy.props.FloatProperty(
-        name="Factor",
-        description="Distance factor",
+    distance: bpy.props.FloatProperty(
+        name="Distance",
+        description="Maximum smoothing distance",
+        subtype='DISTANCE',
         default=1.0,
         min=0.0,
     )
     power: bpy.props.FloatProperty(
         name="Power",
-        description="Power",
+        description="Scaling factor for new weights",
         default=1.0,
-        min=1.0,
+        min=0.01,
     )
 
     @classmethod
@@ -63,7 +64,7 @@ def execute(self, context):
             for vert in bm.verts:
                 vert.tag = vert.select
         for vg_idx in vg_idxs:
-            bmesh_vertex_group_bleed(bm, vg_idx, distance=self.factor / 100, power=self.power,
+            bmesh_vertex_group_bleed(bm, vg_idx, distance=self.distance, power=self.power,
                 only_tagged=obj.data.use_paint_mask_vertex)
 
         bm.to_mesh(obj.data)

mesh/vertex_group_smooth_loops.py

@@ -271,17 +271,18 @@ class GRET_OT_vertex_group_smooth_loops(bpy.types.Operator):
         description="Subset of vertex groups to modify",
         default='ACTIVE',
     )
-    factor: bpy.props.FloatProperty(
-        name="Factor",
-        description="Distance factor",
+    distance: bpy.props.FloatProperty(
+        name="Distance",
+        description="Maximum smoothing distance",
+        subtype='DISTANCE',
         default=1.0,
         min=0.0,
     )
     power: bpy.props.FloatProperty(
         name="Power",
-        description="Power",
+        description="Scaling factor for new weights",
         default=1.0,
-        min=1.0,
+        min=0.01,
     )
 
     @classmethod
@@ -321,7 +322,7 @@ def execute(self, context):
                 for vert_idx in vert_idxs:
                     bm.verts[vert_idx].tag = True
                 for vg_idx in vg_idxs:
-                    bmesh_vertex_group_bleed(bm, vg_idx, distance=self.factor / 100, power=self.power,
+                    bmesh_vertex_group_bleed(bm, vg_idx, distance=self.distance, power=self.power,
                         only_tagged=True)
 
         bm.to_mesh(obj.data)