Merge pull request #51 from specklesystems/izzy/toggle-modifiers

feat(send): toggle applying modifiers

bpy_speckle/convert/__init__.py

@@ -288,12 +288,14 @@ def get_blender_custom_properties(obj, max_depth=1000):
         return obj
 
 
-def to_speckle_object(blender_object, scale):
+def to_speckle_object(blender_object, scale, desgraph=None):
     blender_type = blender_object.type
     speckle_objects = []
     speckle_material = material_to_speckle(blender_object)
 
     if blender_type in TO_SPECKLE.keys():
+        if desgraph:
+            blender_object = blender_object.evaluated_get(desgraph)
         converted = TO_SPECKLE[blender_type](blender_object, blender_object.data, scale)
         if isinstance(converted, list):
             speckle_objects.extend([c for c in converted if c != None])

bpy_speckle/operators/streams.py

@@ -328,6 +328,7 @@ class SendStreamObjects(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
     bl_description = "Send selected objects to active stream"
 
+    apply_modifiers: BoolProperty(name="Apply modifiers", default=True)
     commit_message: StringProperty(
         name="Message",
         default="Pushed elements from Blender.",
@@ -337,6 +338,7 @@ class SendStreamObjects(bpy.types.Operator):
         layout = self.layout
         col = layout.column()
         col.prop(self, "commit_message")
+        col.prop(self, "apply_modifiers")
 
     def invoke(self, context, event):
         wm = context.window_manager
@@ -409,7 +411,13 @@ class SendStreamObjects(bpy.types.Operator):
             if ngons:
                 converted = export_ngons_as_polylines(obj, scale)
             else:
-                converted = to_speckle_object(obj, scale)
+                converted = to_speckle_object(
+                    obj,
+                    scale,
+                    bpy.context.evaluated_depsgraph_get()
+                    if self.apply_modifiers
+                    else None,
+                )
 
             if not converted:
                 continue