X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=470ffc5784e1d4fd0b28d006dfe720863a172257;hb=736a076cf12aca02492eae6c77eff846bde0cdda;hp=a45e881571aea4c0da4b5678f3662eb189863d13;hpb=b13f1bced27e0ad3e4661e645f6bafed38359120;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index a45e8815..470ffc57 100644
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -8,6 +8,7 @@ class MaterialMap:
 		else:
 			self.name = "material_map"
 		self.materials = materials
+		self.material_names = [m.name for m in self.materials]
 		self.srgb_colors = materials[0].srgb_colors
 		for m in self.materials:
 			if m.technique!=self.technique:
@@ -29,12 +30,12 @@ class MaterialMap:
 		cm = get_colormap(self.srgb_colors)
 		self.diffuse_data = ""
 		for m in self.materials:
-			diff = [int(cm(c)*255) for c in m.diffuse_color*m.diffuse_intensity]
-			self.diffuse_data += "\\x{:02X}\\x{:02X}\\x{:02X}\\x{:02X}".format(*diff, int(m.ambient*255))
+			diff = [int(cm(c)*255) for c in m.diffuse_color]
+			self.diffuse_data += "\\x{:02X}\\x{:02X}\\x{:02X}\\xFF".format(*diff)
 		self.diffuse_data += "\\x00\\x00\\x00\\x00"*(self.size[0]*self.size[1]-count)
 
 	def get_material_uv(self, material):
-		index = self.materials.index(material)
+		index = self.material_names.index(material.name)
 		x = index%self.size[0]
 		y = index//self.size[0]
 		return ((x+0.5)/self.size[0], (y+0.5)/self.size[1])