X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmesh.py;fp=blender%2Fio_mspgl%2Fmesh.py;h=8f19676ac1127627e2a78771e949d89a9ce5b9c4;hp=d9ae6b760ff545c8043269bb9e120b597f8b05f7;hb=5bf3c7175c359ad8509702a4e0790609b39e6aec;hpb=147f7097b77e591197dc38b2b263add57d69e4fc

diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py
index d9ae6b76..8f19676a 100644
--- a/blender/io_mspgl/mesh.py
+++ b/blender/io_mspgl/mesh.py
@@ -246,12 +246,12 @@ class Mesh:
 
 		# Merge materials and form a lookup from source material indices to the
 		# merged material list
-		material_map = []
+		material_atlas = []
 		for m in other.materials:
 			if m in self.materials:
-				material_map.append(self.materials.index(m))
+				material_atlas.append(self.materials.index(m))
 			else:
-				material_map.append(len(self.materials))
+				material_atlas.append(len(self.materials))
 				self.materials.append(m)
 
 		# Append data and adjust indices where necessary.  Since the data is
@@ -282,7 +282,7 @@ class Mesh:
 			f.index += offset
 			f.loop_indices = range(f.loop_indices.start+offset, f.loop_indices.stop+offset)
 			if other.materials:
-				f.material_index = material_map[f.material_index]
+				f.material_index = material_atlas[f.material_index]
 
 		offset = len(self.edges)
 		self.edges += other.edges
@@ -402,15 +402,15 @@ class Mesh:
 				for g in v.groups:
 					g.group = group_index_map[g.group]
 
-	def apply_material_map(self, material_map):
+	def apply_material_atlas(self, material_atlas):
 		for m in self.materials:
-			if m.name not in material_map.material_names:
-				raise Exception("Material map is not compatible with Mesh")
+			if m.name not in material_atlas.material_names:
+				raise Exception("Material atlas is not compatible with Mesh")
 
 		if self.use_uv=='NONE':
 			return
 
-		layer = UvLayer("material_map")
+		layer = UvLayer("material_atlas")
 		if self.use_uv=='UNIT0':
 			self.uv_layers = [layer]
 			layer.unit = 0
@@ -422,7 +422,7 @@ class Mesh:
 
 		layer.uvs = [(0.0, 0.0)]*len(self.loops)
 		for f in self.faces:
-			uv = material_map.get_material_uv(self.materials[f.material_index])
+			uv = material_atlas.get_material_uv(self.materials[f.material_index])
 			for i in f.loop_indices:
 				layer.uvs[i] = uv
 
@@ -783,7 +783,7 @@ class Mesh:
 			e.key = make_edge_key(e.vertices[0].index, e.vertices[1].index)
 
 
-def create_mesh_from_object(context, obj, progress, *, material_map=None):
+def create_mesh_from_object(context, obj, progress, *, material_atlas=None):
 	if obj.type!="MESH":
 		raise Exception("Object is not a mesh")
 
@@ -829,8 +829,8 @@ def create_mesh_from_object(context, obj, progress, *, material_map=None):
 
 	mesh.name = obj.data.name
 
-	if material_map:
-		mesh.apply_material_map(material_map)
+	if material_atlas:
+		mesh.apply_material_atlas(material_atlas)
 
 	progress.set_task("Triangulating", 0.2, 0.3)
 	mesh.prepare_triangles(progress)