Update for Depsgraph API changes

Addresses new behavior of object.to_mesh().

This is corresponding part for D4875.

Reviewers: brecht

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D4876

1 files changed, 8 insertions, 6 deletions

diff --git a/io_mesh_stl/blender_utils.py b/io_mesh_stl/blender_utils.py
index 088caa8e..d61adf31 100644
--- a/io_mesh_stl/blender_utils.py
+++ b/io_mesh_stl/blender_utils.py
@@ -81,12 +81,14 @@ def faces_from_mesh(ob, global_matrix, use_mesh_modifiers=False):
     ob.update_from_editmode()
 
     # get the modifiers
+    if use_mesh_modifiers:
+        depsgraph = bpy.context.evaluated_depsgraph_get()
+        mesh_owner = ob.evaluated_get(depsgraph)
+    else:
+        mesh_owner = ob
+
     try:
-        if use_mesh_modifiers:
-            depsgraph = bpy.context.evaluated_depsgraph_get()
-            mesh = ob.evaluated_get(depsgraph).to_mesh()
-        else:
-            mesh = ob.to_mesh()
+        mesh = mesh_owner.to_mesh()
     except RuntimeError:
         return
 
@@ -101,4 +103,4 @@ def faces_from_mesh(ob, global_matrix, use_mesh_modifiers=False):
     for tri in mesh.loop_triangles:
         yield [vertices[index].co.copy() for index in tri.vertices]
 
-    bpy.data.meshes.remove(mesh)
+    mesh_owner.to_mesh_clear()