Update the Blender exporter for version 2.80

[libs/gl.git] / blender / io_mspgl / export_scene.py

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index b28c8e041db4c66d2d43b1dc59d95c1c77e76797..cb623a1587f8fc14a0b15fe41c4eb30d4b3d6a4b 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -4,8 +4,9 @@ import os
 class SceneExporter:
        def __init__(self):
                self.selected_only = False
-               self.active_layers = True
+               self.visible_collections = True
                self.resource_collection = True
+               self.skip_existing = True
                self.show_progress = True
 
        def export_to_file(self, context, out_fn):
@@ -13,11 +14,12 @@ class SceneExporter:
                        objs = context.selected_objects
                else:
                        objs = context.scene.objects
-               if self.active_layers:
-                       layers = context.scene.layers
-                       objs = [o for o in objs if any(a and b for a, b in zip(layers, o.layers))]
+               if self.visible_collections:
+                       collections = [c.collection for c in context.view_layer.layer_collection.children if not (c.hide_viewport or c.collection.hide_viewport)]
+                       objs = [o for o in objs if any((o.name in c.all_objects) for c in collections)]
                objs = [o for o in objs if o.type=="MESH" and not o.lod_for_parent]
                objs = [o for o in objs if (not o.compound or o.parent not in objs)]
+               objs.sort(key=lambda x:x.name)
 
                path, base = os.path.split(out_fn)
                base, ext = os.path.splitext(base)
@@ -80,6 +82,9 @@ class SceneExporter:
                                ".tex2d": "texture2d" }
                        with open(os.path.join(path, base+"_resources.mdc"), "w") as res_out:
                                for r in refs:
+                                       if self.skip_existing and os.path.exists(os.path.join(path, r.name)):
+                                               continue
+
                                        st = Statement(keywords[os.path.splitext(r.name)[1]], r.name)
                                        st.sub = r.statements
                                        st.write_to_file(res_out)