X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=cb623a1587f8fc14a0b15fe41c4eb30d4b3d6a4b;hb=736a076cf12aca02492eae6c77eff846bde0cdda;hp=ac812abf7b115766ab0c08af3848614a4ff99ab4;hpb=b13f1bced27e0ad3e4661e645f6bafed38359120;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index ac812abf..cb623a15 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -4,7 +4,7 @@ import os
 class SceneExporter:
 	def __init__(self):
 		self.selected_only = False
-		self.active_layers = True
+		self.visible_collections = True
 		self.resource_collection = True
 		self.skip_existing = True
 		self.show_progress = True
@@ -14,9 +14,9 @@ class SceneExporter:
 			objs = context.selected_objects
 		else:
 			objs = context.scene.objects
-		if self.active_layers:
-			layers = context.scene.layers
-			objs = [o for o in objs if any(a and b for a, b in zip(layers, o.layers))]
+		if self.visible_collections:
+			collections = [c.collection for c in context.view_layer.layer_collection.children if not (c.hide_viewport or c.collection.hide_viewport)]
+			objs = [o for o in objs if any((o.name in c.all_objects) for c in collections)]
 		objs = [o for o in objs if o.type=="MESH" and not o.lod_for_parent]
 		objs = [o for o in objs if (not o.compound or o.parent not in objs)]
 		objs.sort(key=lambda x:x.name)