]> git.tdb.fi Git - libs/gl.git/commitdiff
Change some leftover .tex2d extensions in the exporter
authorMikko Rasa <tdb@tdb.fi>
Sun, 6 Mar 2022 10:30:58 +0000 (12:30 +0200)
committerMikko Rasa <tdb@tdb.fi>
Sun, 6 Mar 2022 10:30:58 +0000 (12:30 +0200)
blender/io_mspgl/export_material.py

index ffdae1cc7f782cd65ffc2781178e389f3a11fec7..9ec0670a96d2190860f7af70e5f7447398c1fc02 100644 (file)
@@ -77,7 +77,7 @@ class MaterialExporter:
                for p in textured_props:
                        ctx.next_slice(p.texture.image)
 
-                       tex_name = p.texture.image.name+".tex2d"
+                       tex_name = p.texture.image.name+".tex"
                        if tex_name not in resources:
                                resources[tex_name] = texture_export.export_texture(p.texture, p.tex_channels)
 
@@ -123,7 +123,7 @@ class MaterialExporter:
        def create_property_statement(self, mat_res, prop, resources):
                from .datafile import Statement
                if prop.texture:
-                       tex_res = resources[prop.texture.image.name+".tex2d"]
+                       tex_res = resources[prop.texture.image.name+".tex"]
                        from .util import basename
                        return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
                elif not prop.keyword:
@@ -140,11 +140,12 @@ class MaterialAtlasExporter:
 
        def export_technique_resources(self, material_atlas, resources):
                from .datafile import Resource, Statement, Token
-               base_color_name = material_atlas.name+"_base_color.tex2d"
+               base_color_name = material_atlas.name+"_base_color.tex"
                base_color_res = resources.get(base_color_name)
                if not base_color_res:
-                       base_color_res = Resource(base_color_name, "texture2d")
+                       base_color_res = Resource(base_color_name, "texture")
 
+                       base_color_res.statements.append(Statement("type", Token("\\2d")))
                        base_color_res.statements.append(Statement("storage", Token('SRGB_ALPHA'), *material_atlas.size))
                        base_color_res.statements.append(Statement("raw_data", material_atlas.base_color_data))