X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=a86ee26b878dd67596c5fba58a01f8d545136a4b;hb=a25ac71f574649a95cf7f05f3ccad1b5d8ef2655;hp=6cc0be31bf93217d90014c83e8ef95311615757b;hpb=42ae18b7a9dc13a72bf421e564f02829d4bdd5be;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py index 6cc0be31..a86ee26b 100644 --- a/blender/io_mspgl/export_object.py +++ b/blender/io_mspgl/export_object.py @@ -7,7 +7,7 @@ class ObjectExporter: self.use_strips = True self.use_degen_tris = False self.use_textures = True - self.single_file = True + self.collection = False self.shared_resources = True self.export_lods = True @@ -44,14 +44,12 @@ class ObjectExporter: def create_material_exporter(self): from .export_material import MaterialExporter material_export = MaterialExporter() - material_export.single_file = self.single_file material_export.use_textures = self.use_textures return material_export def create_material_map_exporter(self): from .export_material import MaterialMapExporter material_map_export = MaterialMapExporter() - material_map_export.single_file = self.single_file return material_map_export def export_to_file(self, context, out_fn): @@ -79,9 +77,12 @@ class ObjectExporter: r.name = base+ext numbers[ext] = n+1 - for r in refs: - r.write_to_file(os.path.join(path, r.name)) - obj_res.write_to_file(out_fn) + if self.collection: + obj_res.write_collection(out_fn) + else: + for r in refs: + r.write_to_file(os.path.join(path, r.name)) + obj_res.write_to_file(out_fn) def export_object_resources(self, context, obj, resources, progress, material_maps=None): if material_maps is None: @@ -157,10 +158,7 @@ class ObjectExporter: if l.data.name!=prev_mesh: mesh_res = resources[l.data.name+".mesh"] - if not self.single_file: - lod_st.append(obj_res.create_reference_statement("mesh", mesh_res)) - else: - lod_st.append(obj_res.create_embed_statement("mesh", mesh_res)) + lod_st.append(obj_res.create_reference_statement("mesh", mesh_res)) prev_mesh = l.data.name @@ -178,10 +176,8 @@ class ObjectExporter: if tech_res.name!=prev_tech: if material and material.render_mode=='EXTERNAL': lod_st.append(Statement("technique", material.technique)) - elif not self.single_file: - lod_st.append(obj_res.create_reference_statement("technique", tech_res)) else: - lod_st.append(obj_res.create_embed_statement("technique", tech_res)) + lod_st.append(obj_res.create_reference_statement("technique", tech_res)) prev_tech = tech_res.name if i>0: