[Bf-extensions-cvs] [120d313b] master: glTF exporter: rename option from export_selected to use_selected

Julien Duroure noreply at git.blender.org
Wed Mar 4 21:24:33 CET 2020


Commit: 120d313b842e0e5285ad815434d9704f3079d1a0
Author: Julien Duroure
Date:   Wed Mar 4 21:23:54 2020 +0100
Branches: master
https://developer.blender.org/rBA120d313b842e0e5285ad815434d9704f3079d1a0

glTF exporter: rename option from export_selected to use_selected

===================================================================

M	io_scene_gltf2/__init__.py

===================================================================

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index e7a6c212..4c489fda 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -15,7 +15,7 @@
 bl_info = {
     'name': 'glTF 2.0 format',
     'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (1, 2, 33),
+    "version": (1, 2, 34),
     'blender': (2, 82, 7),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',
@@ -215,12 +215,19 @@ class ExportGLTF2_Base:
         default=False
     )
 
+    # keep it for compatibility (for now)
     export_selected: BoolProperty(
         name='Selected Objects',
         description='Export selected objects only',
         default=False
     )
 
+    use_selected: BoolProperty(
+        name='Selected Objects',
+        description='Export selected objects only',
+        default=False
+    )
+
     export_extras: BoolProperty(
         name='Custom Properties',
         description='Export custom properties as glTF extras',
@@ -345,7 +352,13 @@ class ExportGLTF2_Base:
         if settings:
             try:
                 for (k, v) in settings.items():
-                    setattr(self, k, v)
+                    if k == "export_selected": # Back compatibility for export_selected --> use_selected
+                        setattr(self, "use_selected", v)
+                        del settings[k]
+                        settings["use_selected"] = v
+                        print("export_selected is now renamed use_selected, and will be deleted in a few release")
+                    else:
+                        setattr(self, k, v)
                 self.will_save_settings = True
 
             except (AttributeError, TypeError):
@@ -417,7 +430,15 @@ class ExportGLTF2_Base:
         export_settings['gltf_materials'] = self.export_materials
         export_settings['gltf_colors'] = self.export_colors
         export_settings['gltf_cameras'] = self.export_cameras
-        export_settings['gltf_selected'] = self.export_selected
+
+        # compatibility after renaming export_selected to use_selected
+        if self.export_selected is True:
+            self.report({"WARNING"}, "export_selected is now renamed use_selected, and will be deleted in a few release")
+            export_settings['gltf_selected'] = self.export_selected
+        else:
+            export_settings['gltf_selected'] = self.use_selected
+
+        # export_settings['gltf_selected'] = self.use_selected This can be uncomment when removing compatibility of export_selected
         export_settings['gltf_layers'] = True  # self.export_layers
         export_settings['gltf_extras'] = self.export_extras
         export_settings['gltf_yup'] = self.export_yup
@@ -535,7 +556,7 @@ class GLTF_PT_export_include(bpy.types.Panel):
         sfile = context.space_data
         operator = sfile.active_operator
 
-        layout.prop(operator, 'export_selected')
+        layout.prop(operator, 'use_selected')
         layout.prop(operator, 'export_extras')
         layout.prop(operator, 'export_cameras')
         layout.prop(operator, 'export_lights')



More information about the Bf-extensions-cvs mailing list