Redesign object exporting

[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 b2c3a2e671b6f12c8ded80ee8a1dbee098b9d7ed..1dea4b2416b5a7c0d46952570b19448d4be930e9 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -17,16 +17,13 @@ class SceneExporter:
                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 o.type=="MESH" and not o.lod_for_parent and o.data.vertices]
                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)
 
-               from .export_object import ObjectExporter
-               object_export = ObjectExporter()
-
                object_prototypes = {}
                unique_objects = []
                export_names = {}
@@ -75,8 +72,11 @@ class SceneExporter:
                from .util import Progress
                progress = Progress(self.show_progress and context)
 
+               from .export import DataExporter
+               data_exporter = DataExporter()
+
                resources = {}
-               self.export_scene_resources(context, unique_objects, resources, progress)
+               data_exporter.export_resources(context, unique_objects, resources, None, progress)
                for n, r in resources.items():
                        if r.name in export_names:
                                r.name = export_names[r.name]
@@ -98,20 +98,6 @@ class SceneExporter:
 
                scene_res.write_to_file(out_fn)
 
-       def export_scene_resources(self, context, objs, resources, progress):
-               from .export_object import ObjectExporter
-               object_export = ObjectExporter()
-               object_export.single_file = False
-
-               material_atlases = {}
-
-               for i, o in enumerate(objs):
-                       progress.push_task_slice(o.name, i, len(objs))
-                       object_export.export_object_resources(context, o, resources, material_atlases, progress)
-                       obj_name = o.name+".object"
-                       resources[obj_name] = object_export.export_object(context, o, resources, progress)
-                       progress.pop_task()
-
        def export_scene(self, context, objs, resources, prototypes, progress):
                from .datafile import Resource, Statement, Token
                scene_res = Resource("scene.scene", "scene")