X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fscene.py;h=7a0fa2f037d290108e8e3d951d8a7617874208c5;hb=e23fecdc48dc34a61b05296f101bff13fbf9be7d;hp=e4f31067cd8a910e48b842e6b66d04cde1f0259f;hpb=b360bb3cdc7ea3f9f5aba94d11e4f9d4f90c42a7;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/scene.py b/blender/io_mspgl/scene.py
index e4f31067..7a0fa2f0 100644
--- a/blender/io_mspgl/scene.py
+++ b/blender/io_mspgl/scene.py
@@ -1,3 +1,4 @@
+import itertools
 import mathutils
 
 def is_same_object(obj1, obj2):
@@ -56,29 +57,43 @@ class Scene:
 		if obj_filter:
 			objects = list(filter(obj_filter, objects))
 
-		processed = set()
 		for o in objects:
-			if o.name in processed:
-				continue
-
 			if o.type=='MESH':
-				clones = [c for c in objects if is_same_object(o, c)]
-				self.prototypes.append(o)
-				instance_list = self.instances
-				if o.material_slots and o.material_slots[0].material:
-					mat = o.material_slots[0].material
-					if mat.blend_method=='BLEND':
-						instance_list = self.blended_instances
-					if mat.image_based_lighting:
-						self.use_ibl = True
-				for c in clones:
-					instance_list.append(Instance(c, o))
-					processed.add(c.name)
+				self.add_instance(Instance(o, o))
 			elif o.type=='LIGHT':
 				self.lights.append(o)
 				if o.data.use_shadow:
 					self.use_shadow = True
 
+		proto_map = {}
+		for i in itertools.chain(self.instances, self.blended_instances):
+			p = proto_map.get(i.prototype)
+			if p:
+				i.prototype = p
+			else:
+				found = False
+				for p in proto_map.values():
+					if is_same_object(i.prototype, p):
+						proto_map[i.prototype] = p
+						i.prototype = p
+						found = True
+						break
+
+				if not found:
+					proto_map[i.prototype] = i.prototype
+					self.prototypes.append(i.prototype)
+
+	def add_instance(self, instance):
+		obj = instance.prototype
+		instance_list = self.instances
+		if obj.material_slots and obj.material_slots[0].material:
+			mat = obj.material_slots[0].material
+			if mat.blend_method=='BLEND':
+				instance_list = self.blended_instances
+			if mat.image_based_lighting:
+				self.use_ibl = True
+		instance_list.append(instance)
+
 	def get_chain(self):
 		result = []
 		if self.background_set:
@@ -92,7 +107,7 @@ def get_all_collections(collection):
 		result += get_all_collections(c)
 	return result
 
-def create_scene_from_current(context, *, selected_only=False, visible_only=True):
+def create_scene_from_current(ctx, *, selected_only=False, visible_only=True):
 	obj_filters = []
 
 	if selected_only:
@@ -100,7 +115,7 @@ def create_scene_from_current(context, *, selected_only=False, visible_only=True
 
 	if visible_only:
 		visible_names = set()
-		for c in get_all_collections(context.view_layer.layer_collection):
+		for c in get_all_collections(ctx.context.view_layer.layer_collection):
 			if not c.hide_viewport and not c.collection.hide_viewport:
 				visible_names.update(o.name for o in c.collection.objects)
 		obj_filters.append(lambda o: o.name in visible_names)
@@ -111,7 +126,7 @@ def create_scene_from_current(context, *, selected_only=False, visible_only=True
 	if obj_filters:
 		obj_filter = lambda o: all(f(o) for f in obj_filters)
 
-	return Scene(context.scene, obj_filter)
+	return Scene(ctx.context.scene, obj_filter)
 
 def create_scene(scene, *, visible_only=True):
 	obj_filter = None