X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=79575f7df23b2c80761e24c09f499f68b7f45ee6;hb=27a3dcc73777bcc53f93eaf66e90370b061d3988;hp=2158764d40dbd74ff4303c8455b777d720c82a21;hpb=5590886411b5779a7e6aa6a5ffeda8db6c515a55;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index 2158764d..79575f7d 100644
--- a/blender/io_mspgl/__init__.py
+++ b/blender/io_mspgl/__init__.py
@@ -14,11 +14,9 @@ if "bpy" in locals():
 
 import os
 import bpy
-from bpy_extras.io_utils import ExportHelper
-
-class ExportMspGLBase(ExportHelper):
-	show_progress: bpy.props.BoolProperty(name="Show progress", description="Display progress indicator while exporting", default=True)
+import bpy_extras
 
+class ExportHelper(bpy_extras.io_utils.ExportHelper):
 	def set_extension(self, ext):
 		ext_changed = (ext!=self.filename_ext)
 		if ext_changed:
@@ -27,19 +25,6 @@ class ExportMspGLBase(ExportHelper):
 			self.filename_ext = ext
 		return ext_changed
 
-	def execute(self, context):
-		exporter = self.create_exporter()
-		self.prepare_exporter(exporter)
-		exporter.export_to_file(context, self.filepath)
-		return {"FINISHED"}
-
-	def create_exporter(self):
-		raise Exception("create_exporter must be overridden")
-
-	def prepare_exporter(self, exporter):
-		for k, v in self.as_keywords().items():
-			setattr(exporter, k, v)
-
 class ExportMspGLData(bpy.types.Operator):
 	bl_idname = "export.mspgl_data"
 	bl_label = "Export Msp GL data"
@@ -76,7 +61,7 @@ class ExportMspGLData(bpy.types.Operator):
 		col.prop(self, "collection")
 		col.prop(self, "shared_resources")
 
-class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase):
+class ExportMspGLAnimation(bpy.types.Operator, ExportHelper):
 	bl_idname = "export.mspgl_animation"
 	bl_label = "Export Msp GL animation"
 	bl_description = "Export one or more animations in Msp GL format"
@@ -92,9 +77,14 @@ class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase):
 		super_result = super().check(context)
 		return ext_changed or super_result
 
-	def create_exporter(self):
+	def execute(self, context):
 		from .export_animation import AnimationExporter
-		return AnimationExporter()
+		exporter = AnimationExporter()
+		exporter.export_all = self.export_all
+		exporter.collection = self.collection
+		exporter.looping_threshold = self.looping_threshold
+		exporter.export_to_file(context, self.filepath)
+		return {'FINISHED'}
 
 	def draw(self, context):
 		col = self.layout.column()
@@ -103,7 +93,7 @@ class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase):
 			col.prop(self, "collection")
 		col.prop(self, "looping_threshold")
 
-class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
+class ExportMspGLScene(bpy.types.Operator, ExportHelper):
 	bl_idname = "export_scene.mspgl_scene"
 	bl_label = "Export Msp GL scene"
 	bl_description = "Export the active scene in Msp GL format"
@@ -124,9 +114,15 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
 		super_result = super().check(context)
 		return ext_changed or super_result
 
-	def create_exporter(self):
+	def execute(self, context):
 		from .export_scene import SceneExporter
-		return SceneExporter()
+		exporter = SceneExporter()
+		exporter.selected_only = self.selected_only
+		exporter.visible_only = self.visible_only
+		exporter.collection = self.collection
+		exporter.skip_existing = self.skip_existing
+		exporter.export_to_file(context, self.filepath)
+		return {'FINISHED'}
 
 	def draw(self, context):
 		col = self.layout.column()