X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mesh_mspgl%2Fexport_mspgl.py;h=1046630ba088d1bc8ec191448249c6e7881e9fd6;hb=0c12510c3ef9b47609cc6671b1b30f7f3d7ba20b;hp=1d7062e68eaa2d5bdca07d500a87549965b953e6;hpb=8b8361a2bb9bb377f222408ec59422bd33cfd64f;p=libs%2Fgl.git

diff --git a/blender/io_mesh_mspgl/export_mspgl.py b/blender/io_mesh_mspgl/export_mspgl.py
index 1d7062e6..1046630b 100644
--- a/blender/io_mesh_mspgl/export_mspgl.py
+++ b/blender/io_mesh_mspgl/export_mspgl.py
@@ -244,19 +244,19 @@ class Exporter:
 		if self.smoothing!="BLENDER":
 			mesh.compute_normals()
 
-		if self.material_tex:
+		if self.material_tex and mesh.materials:
 			mesh.generate_material_uv()
 
 		texunits = []
-		if mesh.uv_textures and self.export_uv!="NONE":
+		if mesh.uv_layers and self.export_uv!="NONE":
 			if self.export_uv=="UNIT0":
 				texunits = [0]
 			else:
-				texunits = list(range(len(mesh.uv_textures)))
+				texunits = list(range(len(mesh.uv_layers)))
 
 			tbn_unit = 0
 			if self.tbn_vecs:
-				uvtex_names = [u.name for u in mesh.uv_textures]
+				uvtex_names = [u.name for u in mesh.uv_layers]
 				if self.tbn_uvtex in uvtex_names:
 					tbn_unit = uvtex_names.index(uvtex)
 					del texunits[tbn_unit]
@@ -293,7 +293,7 @@ class Exporter:
 		fmt += "_VERTEX3"
 		out_file.begin("vertices", fmt)
 		normal = None
-		uvs = [None]*len(mesh.uv_textures)
+		uvs = [None]*len(mesh.uv_layers)
 		tan = None
 		bino = None
 		for v in mesh.vertices:
@@ -345,34 +345,35 @@ class Exporter:
 			out_file.end()
 			out_file.begin("technique")
 			out_file.begin("pass", '""')
-			if self.material_tex:
-				out_file.begin("material")
-				out_file.write("diffuse", 1.0, 1.0, 1.0, 1.0)
-				out_file.end()
-				out_file.begin("texunit", 0)
-				out_file.begin("texture2d")
-				out_file.write("min_filter", "NEAREST")
-				out_file.write("mag_filter", "NEAREST")
-				out_file.write("storage", "RGB", len(mesh.materials), 1)
-				texdata = '"'
-				for m in mesh.materials:
-					color = [int(c*255) for c in m.diffuse_color]
-					texdata += "\\x%02X\\x%02X\\x%02X"%tuple(color)
-				texdata += '"'
-				out_file.write("raw_data", texdata)
-				out_file.end()
-				out_file.end()
-			elif mesh.materials:
-				mat = mesh.materials[0]
-				out_file.begin("material")
-				diff = mat.diffuse_color
-				out_file.write("diffuse", diff.r, diff.g, diff.b, 1.0)
-				amb = diff*mat.ambient
-				out_file.write("ambient", amb.r, amb.g, amb.b, 1.0)
-				spec = mat.specular_color*mat.specular_intensity
-				out_file.write("specular", spec.r, spec.g, spec.b, 1.0)
-				out_file.write("shininess", mat.specular_hardness);
-				out_file.end()
+			if mesh.materials:
+				if self.material_tex:
+					out_file.begin("material")
+					out_file.write("diffuse", 1.0, 1.0, 1.0, 1.0)
+					out_file.end()
+					out_file.begin("texunit", 0)
+					out_file.begin("texture2d")
+					out_file.write("min_filter", "NEAREST")
+					out_file.write("mag_filter", "NEAREST")
+					out_file.write("storage", "RGB", len(mesh.materials), 1)
+					texdata = '"'
+					for m in mesh.materials:
+						color = [int(c*255) for c in m.diffuse_color]
+						texdata += "\\x%02X\\x%02X\\x%02X"%tuple(color)
+					texdata += '"'
+					out_file.write("raw_data", texdata)
+					out_file.end()
+					out_file.end()
+				else:
+					mat = mesh.materials[0]
+					out_file.begin("material")
+					diff = mat.diffuse_color
+					out_file.write("diffuse", diff.r, diff.g, diff.b, 1.0)
+					amb = diff*mat.ambient
+					out_file.write("ambient", amb.r, amb.g, amb.b, 1.0)
+					spec = mat.specular_color*mat.specular_intensity
+					out_file.write("specular", spec.r, spec.g, spec.b, 1.0)
+					out_file.write("shininess", mat.specular_hardness);
+					out_file.end()
 			out_file.end()
 			out_file.end()