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

diff --git a/blender/io_mspgl/scene.py b/blender/io_mspgl/scene.py
index 28c30ad7..e4f31067 100644
--- a/blender/io_mspgl/scene.py
+++ b/blender/io_mspgl/scene.py
@@ -13,7 +13,7 @@ class Instance:
 		self.name = obj.name
 		self.matrix_world = obj.matrix_world
 		self.rotation_mode = obj.rotation_mode
-		self.prototype = prototype.name
+		self.prototype = prototype
 
 class Scene:
 	def __init__(self, scene, obj_filter=None):
@@ -23,7 +23,10 @@ class Scene:
 		self.camera = scene.camera
 		self.prototypes = []
 		self.instances = []
+		self.blended_instances = []
 		self.lights = []
+		self.realtime_sky = False
+		self.sun_light = None
 		self.ambient_light = mathutils.Color((0.0, 0.0, 0.0))
 		self.exposure = scene.view_settings.exposure
 
@@ -42,6 +45,12 @@ class Scene:
 					s = surface_node.inputs["Strength"].default_value
 					self.ambient_light = mathutils.Color(c[:3])*s
 
+			self.use_sky = scene.world.use_sky and scene.world.sun_light
+			self.sun_light = scene.world.sun_light
+
+		self.use_shadow = False
+		self.use_ibl = False
+
 		objects = scene.objects[:]
 		objects.sort(key=lambda o:o.name)
 		if obj_filter:
@@ -55,11 +64,20 @@ class Scene:
 			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:
-					self.instances.append(Instance(c, o))
+					instance_list.append(Instance(c, o))
 					processed.add(c.name)
 			elif o.type=='LIGHT':
 				self.lights.append(o)
+				if o.data.use_shadow:
+					self.use_shadow = True
 
 	def get_chain(self):
 		result = []