From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 16 Oct 2021 09:10:20 +0000 (+0300)
Subject: Remove the scene type property from Blender exporter
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c17add060e6db20bb4de3965801565f2f5f0c275;p=libs%2Fgl.git

Remove the scene type property from Blender exporter

It's better managed automatically based on object transparency and other
factors.
---

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 45a681c6..0fb12dd3 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -37,7 +37,7 @@ class SceneExporter:
 		from .datafile import Resource, Statement, Token
 		scene_res = Resource(scene.name+".scene", "scene")
 
-		scene_res.statements.append(Statement("type", Token(scene.scene_type.lower())))
+		scene_res.statements.append(Statement("type", Token("simple")))
 
 		for i in scene.instances:
 			obj_res = resources[i.prototype+".object"]
diff --git a/blender/io_mspgl/properties.py b/blender/io_mspgl/properties.py
index 6d847012..7b67955a 100644
--- a/blender/io_mspgl/properties.py
+++ b/blender/io_mspgl/properties.py
@@ -10,7 +10,6 @@ class MspGLSceneProperties(bpy.types.Panel):
 	def draw(self, context):
 		scene = context.scene
 
-		self.layout.prop(scene, "scene_type")
 		self.layout.prop(scene, "export_disposition")
 
 class MspGLMeshProperties(bpy.types.Panel):
@@ -197,10 +196,6 @@ def register_properties():
 	for c in classes:
 		bpy.utils.register_class(c)
 
-	bpy.types.Scene.scene_type = bpy.props.EnumProperty(name="Scene type", description="Type of scene to use for exporting", default="SIMPLE",
-		items=(("SIMPLE", "Simple", "Objects are rendered in no specific order"),
-			("ORDERED", "Ordered", "Objects are rendered in order by their name"),
-			("ZSORTED", "Z-sorted", "Objects are rendered in order by their distance from the camera")))
 	bpy.types.Scene.export_disposition = bpy.props.EnumProperty(name="Export disposition", description="What to do with this scene during project export", default="IGNORE",
 		items=(("IGNORE", "Ignore", "The scene won't be exported"),
 			("CONTENTS", "Contents only", "Objects in the scene will be exported, but not the scene itself"),
diff --git a/blender/io_mspgl/scene.py b/blender/io_mspgl/scene.py
index c89aa3df..28c30ad7 100644
--- a/blender/io_mspgl/scene.py
+++ b/blender/io_mspgl/scene.py
@@ -18,7 +18,6 @@ class Instance:
 class Scene:
 	def __init__(self, scene, obj_filter=None):
 		self.name = scene.name
-		self.scene_type = scene.scene_type
 		self.export_disposition = scene.export_disposition
 		self.background_set = None
 		self.camera = scene.camera