[Bf-extensions-cvs] [38dfced7] master: Fix T78864: the apply_as parameter of modifier_apply was removed.

Alexander Gavrilov noreply at git.blender.org
Wed Jul 15 10:37:28 CEST 2020


Commit: 38dfced7bba68b38b17322c0ea2acf18f27c1804
Author: Alexander Gavrilov
Date:   Wed Jul 15 11:37:16 2020 +0300
Branches: master
https://developer.blender.org/rBA38dfced7bba68b38b17322c0ea2acf18f27c1804

Fix T78864: the apply_as parameter of modifier_apply was removed.

Explicitly specifying DATA was redundant anyway, as that was the default.

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

M	add_mesh_extra_objects/add_mesh_round_brilliant.py
M	archipack/archipack_reference_point.py
M	mesh_auto_mirror.py
M	mesh_bsurfaces.py
M	mesh_tissue/dual_mesh.py
M	object_carver/carver_operator.py
M	object_carver/carver_utils.py
M	object_skinify.py
M	space_view3d_modifier_tools.py

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

diff --git a/add_mesh_extra_objects/add_mesh_round_brilliant.py b/add_mesh_extra_objects/add_mesh_round_brilliant.py
index 49232151..bdd9b68c 100644
--- a/add_mesh_extra_objects/add_mesh_round_brilliant.py
+++ b/add_mesh_extra_objects/add_mesh_round_brilliant.py
@@ -298,7 +298,7 @@ def addBrilliant(context, self, s, table_w, crown_h, girdle_t, pavi_d, bezel_f,
         bpy.context.tool_settings.mesh_select_mode = sel_mode
         bpy.ops.object.mode_set(mode='OBJECT', toggle=False)
 
-        bpy.ops.object.modifier_apply(apply_as='DATA', modifier="EdgeSplit")
+        bpy.ops.object.modifier_apply(modifier="EdgeSplit")
 
     return dobj
 
diff --git a/archipack/archipack_reference_point.py b/archipack/archipack_reference_point.py
index 99acf9d8..5548511c 100644
--- a/archipack/archipack_reference_point.py
+++ b/archipack/archipack_reference_point.py
@@ -298,8 +298,7 @@ class ARCHIPACK_OT_apply_holes(Operator):
         for mod in o.modifiers[:]:
             ctx['modifier'] = mod
             try:
-                bpy.ops.object.modifier_apply(ctx, apply_as='DATA',
-                                              modifier=mod.name)
+                bpy.ops.object.modifier_apply(ctx, modifier=mod.name)
             except:
                 pass
 
diff --git a/mesh_auto_mirror.py b/mesh_auto_mirror.py
index 1d89d4e7..47611668 100644
--- a/mesh_auto_mirror.py
+++ b/mesh_auto_mirror.py
@@ -194,8 +194,7 @@ class AutoMirror(bpy.types.Operator):
             bpy.context.object.modifiers[-1].show_on_cage = automirror.show_on_cage
             if automirror.apply_mirror:
                 bpy.ops.object.mode_set(mode = 'OBJECT')
-                bpy.ops.object.modifier_apply(apply_as = 'DATA',
-                                              modifier = bpy.context.object.modifiers[-1].name)
+                bpy.ops.object.modifier_apply(modifier = bpy.context.object.modifiers[-1].name)
                 if automirror.toggle_edit:
                     bpy.ops.object.mode_set(mode = 'EDIT')
                 else:
diff --git a/mesh_bsurfaces.py b/mesh_bsurfaces.py
index c0c7a4f9..9e7f7a59 100644
--- a/mesh_bsurfaces.py
+++ b/mesh_bsurfaces.py
@@ -1660,7 +1660,7 @@ class MESH_OT_SURFSK_add_surface(Operator):
         shrinkwrap_modifier.wrap_method = "NEAREST_VERTEX"
         shrinkwrap_modifier.target = self.main_object
 
-        bpy.ops.object.modifier_apply('INVOKE_REGION_WIN', apply_as='DATA', modifier=shrinkwrap_modifier.name)
+        bpy.ops.object.modifier_apply('INVOKE_REGION_WIN', modifier=shrinkwrap_modifier.name)
 
         # Make list with verts of original mesh as index and coords as value
         main_object_verts_coords = []
@@ -4010,7 +4010,7 @@ class CURVE_OT_SURFSK_reorder_splines(Operator):
         bpy.ops.object.modifier_add('INVOKE_REGION_WIN', type='SHRINKWRAP')
         curves_duplicate_2.modifiers["Shrinkwrap"].wrap_method = "NEAREST_VERTEX"
         curves_duplicate_2.modifiers["Shrinkwrap"].target = GP_strokes_mesh
-        bpy.ops.object.modifier_apply('INVOKE_REGION_WIN', apply_as='DATA', modifier='Shrinkwrap')
+        bpy.ops.object.modifier_apply('INVOKE_REGION_WIN', modifier='Shrinkwrap')
 
         # Get the distance of each vert from its original position to its position with Shrinkwrap
         nearest_points_coords = {}
diff --git a/mesh_tissue/dual_mesh.py b/mesh_tissue/dual_mesh.py
index db24f896..404d5ef5 100644
--- a/mesh_tissue/dual_mesh.py
+++ b/mesh_tissue/dual_mesh.py
@@ -240,9 +240,7 @@ class dual_mesh(Operator):
                 if ob.modifiers[0].name == "dual_mesh_subsurf":
                     break
 
-            bpy.ops.object.modifier_apply(
-                    apply_as='DATA', modifier='dual_mesh_subsurf'
-                    )
+            bpy.ops.object.modifier_apply(modifier='dual_mesh_subsurf')
 
             bpy.ops.object.mode_set(mode='EDIT')
             bpy.ops.mesh.select_all(action='DESELECT')
diff --git a/object_carver/carver_operator.py b/object_carver/carver_operator.py
index 95fa4af0..880f6491 100644
--- a/object_carver/carver_operator.py
+++ b/object_carver/carver_operator.py
@@ -1196,7 +1196,7 @@ class CARVER_OT_operator(bpy.types.Operator):
                     for mb in ActiveObj.modifiers:
                         if (mb.type == 'BOOLEAN') and (mb.name == BMname):
                             try:
-                                bpy.ops.object.modifier_apply(apply_as='DATA', modifier=BMname)
+                                bpy.ops.object.modifier_apply(modifier=BMname)
                             except:
                                 bpy.ops.object.modifier_remove(modifier=BMname)
                                 exc_type, exc_value, exc_traceback = sys.exc_info()
@@ -1208,7 +1208,7 @@ class CARVER_OT_operator(bpy.types.Operator):
                     for mb in self.CurrentObj.modifiers:
                         if (mb.type == 'SOLIDIFY') and (mb.name == "CT_SOLIDIFY"):
                             try:
-                                bpy.ops.object.modifier_apply(apply_as='DATA', modifier="CT_SOLIDIFY")
+                                bpy.ops.object.modifier_apply(modifier="CT_SOLIDIFY")
                             except:
                                 exc_type, exc_value, exc_traceback = sys.exc_info()
                                 self.report({'ERROR'}, str(exc_value))
@@ -1243,7 +1243,7 @@ class CARVER_OT_operator(bpy.types.Operator):
                 for mb in ActiveObj.modifiers:
                     if (mb.type == 'BOOLEAN') and (mb.name == BMname):
                         try:
-                            bpy.ops.object.modifier_apply(apply_as='DATA', modifier=BMname)
+                            bpy.ops.object.modifier_apply(modifier=BMname)
                         except:
                             bpy.ops.object.modifier_remove(modifier=BMname)
                             exc_type, exc_value, exc_traceback = sys.exc_info()
diff --git a/object_carver/carver_utils.py b/object_carver/carver_utils.py
index 495aa1ce..1bd7455f 100644
--- a/object_carver/carver_utils.py
+++ b/object_carver/carver_utils.py
@@ -695,7 +695,7 @@ def boolean_operation(bool_type="DIFFERENCE"):
     ActiveObj = bpy.context.active_object
     sel_index = 0 if bpy.context.selected_objects[0] != bpy.context.active_object else 1
 
-    # bpy.ops.object.modifier_apply(apply_as='DATA', modifier="CT_SOLIDIFY")
+    # bpy.ops.object.modifier_apply(modifier="CT_SOLIDIFY")
     bool_name = "CT_" + bpy.context.selected_objects[sel_index].name
     BoolMod = ActiveObj.modifiers.new(bool_name, "BOOLEAN")
     BoolMod.object = bpy.context.selected_objects[sel_index]
@@ -736,14 +736,14 @@ def Rebool(context, self):
     if self.ObjectBrush or self.ProfileBrush:
         rebool_obj.show_in_front = False
         try:
-            bpy.ops.object.modifier_apply(apply_as='DATA', modifier="CT_SOLIDIFY")
+            bpy.ops.object.modifier_apply(modifier="CT_SOLIDIFY")
         except:
             exc_type, exc_value, exc_traceback = sys.exc_info()
             self.report({'ERROR'}, str(exc_value))
 
     if self.dont_apply_boolean is False:
         try:
-            bpy.ops.object.modifier_apply(apply_as='DATA', modifier="CT_INTERSECT")
+            bpy.ops.object.modifier_apply(modifier="CT_INTERSECT")
         except:
             exc_type, exc_value, exc_traceback = sys.exc_info()
             self.report({'ERROR'}, str(exc_value))
@@ -758,7 +758,7 @@ def Rebool(context, self):
     target_obj.select_set(True)
     if self.dont_apply_boolean is False:
         try:
-            bpy.ops.object.modifier_apply(apply_as='DATA', modifier="CT_DIFFERENCE")
+            bpy.ops.object.modifier_apply(modifier="CT_DIFFERENCE")
         except:
             exc_type, exc_value, exc_traceback = sys.exc_info()
             self.report({'ERROR'}, str(exc_value))
diff --git a/object_skinify.py b/object_skinify.py
index 177f8de9..f102d8cf 100644
--- a/object_skinify.py
+++ b/object_skinify.py
@@ -551,8 +551,8 @@ def generate_mesh(shape_object, size, thickness=0.8, finger_thickness=0.25, sub_
 
     # object mode apply all modifiers
     if apply_mod:
-        bpy.ops.object.modifier_apply(override, apply_as='DATA', modifier="Skin")
-        bpy.ops.object.modifier_apply(override, apply_as='DATA', modifier="Subsurf")
+        bpy.ops.object.modifier_apply(override, modifier="Skin")
+        bpy.ops.object.modifier_apply(override, modifier="Subsurf")
 
     return {'FINISHED'}
 
diff --git a/space_view3d_modifier_tools.py b/space_view3d_modifier_tools.py
index aaef9b6a..1fb64635 100644
--- a/space_view3d_modifier_tools.py
+++ b/space_view3d_modifier_tools.py
@@ -58,7 +58,7 @@ class ApplyAllModifiers(Operator):
                 is_mod = True
                 try:
                     bpy.ops.object.modifier_apply(
-                                        contx, apply_as='DATA',
+                                        contx,
                                         modifier=contx['modifier'].name
                                         )
                 except:



More information about the Bf-extensions-cvs mailing list