X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=a0e4118118967e41a60ef50654c248beab6fb0a8;hb=bde3ec824d300e9aff11914406fb76dd9016e387;hp=b4b9c2365bc22ea14b7f11fec5c06120c74fb870;hpb=907a2aced4b7d70af6be0625632ba373c458f197;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index b4b9c236..a0e41181 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -54,7 +54,8 @@ class SceneExporter:
 			keywords = { ".mat": "material",
 				".mesh": "mesh",
 				".object": "object",
-				".tech": "technique" }
+				".tech": "technique",
+				".tex2d": "texture2d" }
 			with open(os.path.join(path, base+"_resources.mdc"), "w") as res_out:
 				for r in refs:
 					st = Statement(keywords[os.path.splitext(r.name)[1]], r.name)
@@ -76,12 +77,13 @@ class SceneExporter:
 	def export_scene_resources(self, context, objs, resources, progress):
 		from .export_object import ObjectExporter
 		object_export = ObjectExporter()
-		object_export.separate_mesh = True
-		object_export.separate_tech = True
+		object_export.single_file = False
+
+		material_maps = {}
 
 		for i, o in enumerate(objs):
 			progress.push_task_slice(o.name, i, len(objs))
-			object_export.export_object_resources(context, o, resources, progress)
+			object_export.export_object_resources(context, o, resources, progress, material_maps=material_maps)
 			obj_name = o.name+".object"
 			resources[obj_name] = object_export.export_object(context, o, progress, resources=resources)
 			progress.pop_task()