Replace single file mode in object exporter with collection

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

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 8f9bdd40ba31a72c7c7c8d61add3a8a11c67f02d..0a75c47a761e929bbd5bf1c4485406357b99eb61 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -1,16 +1,13 @@
 import os
 
-def create_technique_resource(material, resources, single_file):
+def create_technique_resource(material, resources):
        from .datafile import Resource, Statement
        tech_res = Resource(material.name+".tech", "technique")
 
        mat_res = resources[material.name+".mat"]
 
        st = Statement("pass", "")
-       if single_file:
-               st.sub.append(tech_res.create_embed_statement("material", mat_res))
-       else:
-               st.sub.append(tech_res.create_reference_statement("material", mat_res))
+       st.sub.append(tech_res.create_embed_statement("material", mat_res))
 
        if material.render_mode=='CUSTOM':
                st.sub.append(Statement("shader", material.shader))
@@ -21,13 +18,13 @@ def create_technique_resource(material, resources, single_file):
 
 class MaterialExporter:
        def __init__(self):
-               self.single_file = True
                self.use_textures = True
+               self.inline_texture_data = False
 
        def create_texture_exporter(self):
                from .export_texture import TextureExporter
                texture_export = TextureExporter()
-               texture_export.inline_data = self.single_file
+               texture_export.inline_data = self.inline_texture_data
                return texture_export
 
        def export_technique_resources(self, material, resources):
@@ -48,7 +45,7 @@ class MaterialExporter:
                        resources[mat_name] = self.export_material(material, resources=resources)
 
        def export_technique(self, material, *, resources):
-               return create_technique_resource(material, resources, self.single_file)
+               return create_technique_resource(material, resources)
 
        def export_material(self, material, *, resources):
                from .datafile import Resource, Statement
@@ -69,9 +66,7 @@ class MaterialExporter:
                if self.use_textures and prop.texture:
                        tex_res = resources[prop.texture.image.name+".tex2d"]
                        fn = os.path.basename(prop.texture.image.filepath)
-                       if self.single_file:
-                               raise Exception("Can't export textures to a single file")
-                       elif prop.texture.default_filter and fn:
+                       if prop.texture.default_filter and fn:
                                return Statement(keyword+"_map", fn)
                        else:
                                return mat_res.create_reference_statement(keyword+"_map", tex_res)
@@ -83,7 +78,7 @@ class MaterialExporter:
 
 class MaterialMapExporter:
        def __init__(self):
-               self.single_file = True
+               pass
 
        def export_technique_resources(self, material_map, resources):
                from .datafile import Resource, Statement, Token
@@ -108,4 +103,4 @@ class MaterialMapExporter:
                        resources[mat_name] = mat_res
 
        def export_technique(self, material_map, *, resources):
-               return create_technique_resource(material_map, resources, self.single_file)
+               return create_technique_resource(material_map, resources)