diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-15 15:11:13 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-16 11:34:11 +0300 |
commit | e5c3ae31189b3acb54d33061da2bd27c3d0abad5 (patch) | |
tree | a53fe430313980bc37f98966d35d2c390cdbfb62 /mesh_tissue | |
parent | 05baedacbfdb15b74a2c89a790e8b3f196ef1417 (diff) |
Addons: Adopt for Dependency Graph API changes
Mainly search-and-replace approach.
Tested the enabled-by-default export/import addons. Seems to work with
an exception of X3D which is still referencing Blender Internal material
properties.
Reviewers: brecht
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D4866
Diffstat (limited to 'mesh_tissue')
-rw-r--r-- | mesh_tissue/lattice.py | 9 | ||||
-rw-r--r-- | mesh_tissue/tessellate_numpy.py | 41 | ||||
-rw-r--r-- | mesh_tissue/uv_to_mesh.py | 7 |
3 files changed, 26 insertions, 31 deletions
diff --git a/mesh_tissue/lattice.py b/mesh_tissue/lattice.py index 4b53afe7..eb1269a3 100644 --- a/mesh_tissue/lattice.py +++ b/mesh_tissue/lattice.py @@ -306,6 +306,7 @@ class lattice_along_surface(Operator): if len(bpy.context.selected_objects) != 2: self.report({'ERROR'}, "Please, select two objects") return {'CANCELLED'} + depsgraph = context.evaluated_depsgraph_get() grid_obj = bpy.context.active_object if grid_obj.type not in ('MESH', 'CURVE', 'SURFACE'): self.report({'ERROR'}, "The surface object is not valid. Only Mesh," @@ -320,10 +321,7 @@ class lattice_along_surface(Operator): break try: obj_dim = obj.dimensions - obj_me = obj.to_mesh( - bpy.context.scene, apply_modifiers=True, - settings='PREVIEW' - ) + obj_me = obj.evaluated_get(depsgraph).to_mesh() except: self.report({'ERROR'}, "The object to deform is not valid. Only " "Mesh, Curve, Surface and Font objects are allowed.") @@ -333,8 +331,7 @@ class lattice_along_surface(Operator): grid_obj = bpy.context.active_object bpy.ops.object.convert(target='MESH') bpy.ops.object.transform_apply(location=True, rotation=True, scale=True) - grid_mesh = grid_obj.to_mesh(bpy.context.scene, apply_modifiers=True, - settings='PREVIEW') + grid_mesh = grid_obj.evaluated_get(depsgraph).to_mesh() if len(grid_mesh.polygons) > 64 * 64: bpy.ops.object.delete(use_global=False) diff --git a/mesh_tissue/tessellate_numpy.py b/mesh_tissue/tessellate_numpy.py index 8803966d..07c4fc87 100644 --- a/mesh_tissue/tessellate_numpy.py +++ b/mesh_tissue/tessellate_numpy.py @@ -72,9 +72,13 @@ def tassellate(ob0, ob1, offset, zscale, gen_modifiers, com_modifiers, mode, random.seed(rand_seed) old_me0 = ob0.data # Store generator mesh + if gen_modifiers or com_modifiers: + depsgraph = context.evaluated_depsgraph_get() + else: + depsgraph = None + if gen_modifiers: # Apply generator modifiers - me0 = ob0.to_mesh(bpy.context.scene, apply_modifiers=True, - settings='PREVIEW') + me0 = ob0.evaluated_get(depsgraph).to_mesh() else: me0 = ob0.data ob0.data = me0 @@ -92,8 +96,7 @@ def tassellate(ob0, ob1, offset, zscale, gen_modifiers, com_modifiers, mode, # Apply component modifiers if com_modifiers: - me1 = ob1.to_mesh(bpy.context.scene, apply_modifiers=True, - settings='PREVIEW') + me1 = ob1.evaluated_get(depsgraph).to_mesh() else: me1 = ob1.data @@ -666,13 +669,14 @@ class tessellate(Operator): col.prop(self, "object_name") # Count number of faces + if self.gen_modifiers or self.com_modifiers: + depsgraph = context.evaluated_depsgraph_get() + else: + depsgraph = None try: polygons = 0 if self.gen_modifiers: - me_temp = ob0.to_mesh( - bpy.context.scene, - apply_modifiers=True, settings='PREVIEW' - ) + me_temp = ob0.evaluated_get(depsgraph).to_mesh() else: me_temp = ob0.data @@ -684,11 +688,7 @@ class tessellate(Operator): polygons += 1 if self.com_modifiers: - me_temp = bpy.data.objects[self.component].to_mesh( - bpy.context.scene, - apply_modifiers=True, - settings='PREVIEW' - ) + me_temp = bpy.data.objects[self.component].evaluated_get(depsgraph).to_mesh() else: me_temp = bpy.data.objects[self.component].data polygons *= len(me_temp.polygons) @@ -1233,15 +1233,14 @@ class settings_tessellate(Operator): row.prop(self, "bool_selection", text="On selected Faces") col.separator() + if self.gen_modifiers or self.com_modifiers: + depsgraph = context.evaluated_depsgraph_get() + # Count number of faces try: polygons = 0 if self.gen_modifiers: - me_temp = bpy.data.objects[self.generator].to_mesh( - bpy.context.scene, - apply_modifiers=True, - settings='PREVIEW' - ) + me_temp = bpy.data.objects[self.generator].evaluated_get(depsgraph).to_mesh() else: me_temp = bpy.data.objects[self.generator].data @@ -1253,11 +1252,7 @@ class settings_tessellate(Operator): polygons += 1 if self.com_modifiers: - me_temp = bpy.data.objects[self.component].to_mesh( - bpy.context.scene, - apply_modifiers=True, - settings='PREVIEW' - ) + me_temp = bpy.data.objects[self.component].evaluated_get(depsgraph).to_mesh() else: me_temp = bpy.data.objects[self.component].data polygons *= len(me_temp.polygons) diff --git a/mesh_tissue/uv_to_mesh.py b/mesh_tissue/uv_to_mesh.py index a544ff64..8a69b4d3 100644 --- a/mesh_tissue/uv_to_mesh.py +++ b/mesh_tissue/uv_to_mesh.py @@ -85,8 +85,11 @@ class uv_to_mesh(Operator): bpy.ops.object.convert(target='MESH') ob0 = bpy.context.object - me0 = ob0.to_mesh(bpy.context.scene, - apply_modifiers=self.apply_modifiers, settings='PREVIEW') + if self.apply_modifiers: + depsgraph = context.evaluated_depsgraph_get() + me0 = ob0.evaluated_get(depsgraph).to_mesh() + else: + me0 = ob0.to_mesh() area = 0 verts = [] |