From abe48249502a50f798d647cfa05a655379ea656b Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 27 Jun 2020 02:07:02 +0300 Subject: [PATCH] Refactor export extension change into the exporter base class --- blender/io_mspgl/__init__.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py index bb13c488..a1869e3e 100644 --- a/blender/io_mspgl/__init__.py +++ b/blender/io_mspgl/__init__.py @@ -18,6 +18,14 @@ 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) + def set_extension(self, ext): + ext_changed = (ext!=self.filename_ext) + if ext_changed: + if self.filepath.endswith(self.filename_ext): + self.filepath = self.filepath[:-len(self.filename_ext)] + self.filename_ext = ext + return ext_changed + def execute(self, context): exporter = self.create_exporter() self.prepare_exporter(exporter) @@ -102,17 +110,8 @@ class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase): looping_threshold = bpy.props.FloatProperty(name="Looping threshold", description="Tolerance for curve beginning and end values for looping", min=0.0, soft_max=1.0, precision=4, default=0.001) def check(self, context): - result = False - - ext = ".mdc" if self.export_all and self.collection else ".anim" - ext_changed = (ext!=self.filename_ext) - if ext_changed: - if self.filepath.endswith(self.filename_ext): - self.filepath = self.filepath[:-len(self.filename_ext)] - self.filename_ext = ext - + ext_changed = self.set_extension(".mdc" if self.export_all and self.collection else ".anim") super_result = super().check(context) - return ext_changed or super_result def create_exporter(self): -- 2.45.2