X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=6cc0be31bf93217d90014c83e8ef95311615757b;hb=42ae18b7a9dc13a72bf421e564f02829d4bdd5be;hp=6e399b0199f9f77b10175fe5a4a86027d29a88cc;hpb=7ffc6b595b9c8405d1044f8a4d4d3098392e13fa;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 6e399b01..6cc0be31 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -80,13 +80,8 @@ class ObjectExporter:
 				numbers[ext] = n+1
 
 		for r in refs:
-			with open(os.path.join(path, r.name), "w") as out_file:
-				for s in r.statements:
-					s.write_to_file(out_file)
-
-		with open(out_fn, "w") as out_file:
-			for s in obj_res.statements:
-				s.write_to_file(out_file)
+			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:
@@ -105,29 +100,31 @@ class ObjectExporter:
 			progress.push_task_slice("LOD {}".format(lod_index), i, len(lods))
 
 			material_map = None
-			mapped_count = sum(m.material_map for m in l.data.materials if m)
+			mapped_count = sum(m.render_mode!='EXTERNAL' and m.material_map for m in l.data.materials if m)
 			if mapped_count:
-				material_map_tech = l.data.materials[0].technique
-				tech_mismatch = any(m.technique!=material_map_tech for m in l.data.materials)
-				if mapped_count!=len(l.data.materials) or tech_mismatch:
+				mmk = lambda m: m.shader if m.render_mode=='CUSTOM' else ""
+				material_map_key = mmk(l.data.materials[0])
+				key_mismatch = any(mmk(m)!=material_map_key for m in l.data.materials)
+				if mapped_count!=len(l.data.materials) or key_mismatch:
 					raise Exception("Conflicting settings in object materials")
 
-				if material_map_tech in material_maps:
-					material_map = material_maps[material_map_tech]
+				if material_map_key in material_maps:
+					material_map = material_maps[material_map_key]
 				else:
 					material_map = create_material_map(context, l.data.materials[0])
-					material_maps[material_map_tech] = material_map
+					material_maps[material_map_key] = material_map
 
-				tech_name = "material_map_{}.tech".format(os.path.splitext(material_map_tech)[0])
+				tech_name = "{}.tech".format(material_map.name)
 				if tech_name not in resources:
 					material_map_export.export_technique_resources(material_map, resources)
 					resources[tech_name] = material_map_export.export_technique(material_map, resources=resources)
 			elif l.material_slots and l.material_slots[0].material:
 				material = l.material_slots[0].material
-				tech_name = material.name+".tech"
-				if tech_name not in resources:
-					material_export.export_technique_resources(material, resources)
-					resources[tech_name] = material_export.export_technique(material, resources=resources)
+				if material.render_mode!='EXTERNAL':
+					tech_name = material.name+".tech"
+					if tech_name not in resources:
+						material_export.export_technique_resources(material, resources)
+						resources[tech_name] = material_export.export_technique(material, resources=resources)
 			elif "stub.tech" not in resources:
 				resources["stub.tech"] = self.export_stub_technique()
 
@@ -147,7 +144,7 @@ class ObjectExporter:
 		lods = self.collect_object_lods(obj)
 
 		from .datafile import Resource, Statement
-		obj_res = Resource(obj.name+".object")
+		obj_res = Resource(obj.name+".object", "object")
 		statements = obj_res.statements
 
 		center, radius = self.compute_bounding_sphere(obj)
@@ -179,7 +176,7 @@ class ObjectExporter:
 				tech_res = resources["stub.tech"]
 
 			if tech_res.name!=prev_tech:
-				if material and not material.material_map and material.technique and not material.inherit_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))
@@ -200,6 +197,10 @@ class ObjectExporter:
 
 	def export_stub_technique(self):
 		from .datafile import Resource, Statement
-		tech_res = Resource("stub.tech")
-		tech_res.statements.append(Statement("pass", ""))
+		tech_res = Resource("stub.tech", "technique")
+		pass_st = Statement("pass", "")
+		tech_res.statements.append(pass_st)
+		mat_st = Statement("material")
+		pass_st.sub.append(mat_st)
+		mat_st.sub.append(Statement("basic"))
 		return tech_res