X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mesh_mspgl%2Fmesh.py;h=99fb2ee4dafe4f63fbf476440b229654db137de3;hb=b621123e1b2118087223267598d887e8484aba40;hp=ce4a7fd984f8fdffbcf7617c8c17830447ad6779;hpb=ccce05f213b3e97e18d88c1665c144df7ed1c218;p=libs%2Fgl.git

diff --git a/blender/io_mesh_mspgl/mesh.py b/blender/io_mesh_mspgl/mesh.py
index ce4a7fd9..99fb2ee4 100644
--- a/blender/io_mesh_mspgl/mesh.py
+++ b/blender/io_mesh_mspgl/mesh.py
@@ -67,7 +67,6 @@ class Face:
 		self.vertices = mf.vertices[:]
 		self.uvs = []
 		self.flag = False
-		self.material = None
 
 	def __getattr__(self, attr):
 		return getattr(self._mface, attr)
@@ -178,7 +177,8 @@ class Mesh:
 		offset = len(self.faces)
 		for f in other.faces:
 			f.index += offset
-			f.material = material_map[f.material_index]
+			if other.materials:
+				f.material_index = material_map[f.material_index]
 			self.faces.append(f)
 
 		for e in other.edges.values():