X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fscene.py;h=4cb6be5baf63a45d521511a42d28d86de0c86c43;hb=ccc48ed8c2ab0c934e820131746442462ddd8f93;hp=70dbc8c9a7178d19470c5ba3d0ae5e1c2e142250;hpb=308dc6b8f5ee1aa3bb8f205e2ed6464749eebbe5;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/scene.py b/blender/io_mspgl/scene.py
index 70dbc8c9..4cb6be5b 100644
--- a/blender/io_mspgl/scene.py
+++ b/blender/io_mspgl/scene.py
@@ -1,3 +1,5 @@
+import itertools
+import bpy
 import mathutils
 
 def is_same_object(obj1, obj2):
@@ -10,10 +12,16 @@ def is_same_object(obj1, obj2):
 
 class Instance:
 	def __init__(self, obj, prototype):
-		self.name = obj.name
-		self.matrix_world = obj.matrix_world
-		self.rotation_mode = obj.rotation_mode
-		self.prototype = prototype
+		if type(obj)==bpy.types.DepsgraphObjectInstance:
+			self.name = None
+			self.matrix_world = mathutils.Matrix(obj.matrix_world)
+			self.rotation_mode = prototype.rotation_mode
+			self.prototype = bpy.data.objects[prototype.name]
+		else:
+			self.name = obj.name
+			self.matrix_world = obj.matrix_world
+			self.rotation_mode = obj.rotation_mode
+			self.prototype = prototype
 
 class Scene:
 	def __init__(self, scene, obj_filter=None):
@@ -56,29 +64,47 @@ 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
 
+		for i in scene.view_layers[0].depsgraph.object_instances:
+			if i.is_instance and i.object.type=='MESH':
+				self.add_instance(Instance(i, i.object))
+
+		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: