From e19a1351b7432ce798a923557431a0edef457e33 Mon Sep 17 00:00:00 2001
From: Sebastian Sille <nrgsille@noreply.localhost>
Date: Sun, 3 Mar 2024 11:27:05 +0100
Subject: [PATCH] revert 0b9559c1da8304500609096525d06e09153ead50

revert Merge branch 'main' into blender-v4.1-release
---
 io_scene_3ds/__init__.py   | 28 +---------------------------
 io_scene_gltf2/__init__.py |  2 +-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/io_scene_3ds/__init__.py b/io_scene_3ds/__init__.py
index 203c37b2..a6f85bb9 100644
--- a/io_scene_3ds/__init__.py
+++ b/io_scene_3ds/__init__.py
@@ -18,7 +18,7 @@ import bpy
 bl_info = {
     "name": "Autodesk 3DS format",
     "author": "Bob Holcomb, Campbell Barton, Sebastian Schrand",
-    "version": (2, 5, 0),
+    "version": (2, 4, 9),
     "blender": (4, 1, 0),
     "location": "File > Import-Export",
     "description": "3DS Import/Export meshes, UVs, materials, textures, "
@@ -46,7 +46,6 @@ class Import3DS(bpy.types.Operator, ImportHelper):
 
     filename_ext = ".3ds"
     filter_glob: StringProperty(default="*.3ds", options={'HIDDEN'})
-    filepath: StringProperty(subtype='FILE_PATH', options={'SKIP_SAVE'})
 
     constrain_size: FloatProperty(
         name="Constrain Size",
@@ -105,14 +104,8 @@ class Import3DS(bpy.types.Operator, ImportHelper):
         default=False,
     )
 
-    @classmethod
-    def poll(cls, context):
-        return (context.area and context.area.type == "VIEW_3D")
-
     def execute(self, context):
         from . import import_3ds
-        if not self.filepath or not self.filepath.endswith(".3ds"):
-            return {'CANCELLED'}
 
         keywords = self.as_keywords(ignore=("axis_forward",
                                             "axis_up",
@@ -126,27 +119,10 @@ class Import3DS(bpy.types.Operator, ImportHelper):
 
         return import_3ds.load(self, context, **keywords)
 
-    def invoke(self, context, event):
-        if self.filepath:
-            return self.execute(context)
-        context.window_manager.fileselect_add(self)
-        return {'RUNNING_MODAL'}
-
     def draw(self, context):
         pass
 
 
-class MAX3DS_FH_import(bpy.types.FileHandler):
-    bl_idname = "MAX3DS_FH_import"
-    bl_label = "File handler for 3ds import"
-    bl_import_operator = "import_scene.max3ds"
-    bl_file_extensions = ".3ds"
-
-    @classmethod
-    def poll_drop(cls, context):
-        return (context.area and context.area.type == 'VIEW_3D')
-
-
 class MAX3DS_PT_import_include(bpy.types.Panel):
     bl_space_type = 'FILE_BROWSER'
     bl_region_type = 'TOOL_PROPS'
@@ -370,7 +346,6 @@ def menu_func_import(self, context):
 
 def register():
     bpy.utils.register_class(Import3DS)
-    bpy.utils.register_class(MAX3DS_FH_import)
     bpy.utils.register_class(MAX3DS_PT_import_include)
     bpy.utils.register_class(MAX3DS_PT_import_transform)
     bpy.utils.register_class(Export3DS)
@@ -382,7 +357,6 @@ def register():
 
 def unregister():
     bpy.utils.unregister_class(Import3DS)
-    bpy.utils.unregister_class(MAX3DS_FH_import)
     bpy.utils.unregister_class(MAX3DS_PT_import_include)
     bpy.utils.unregister_class(MAX3DS_PT_import_transform)
     bpy.utils.unregister_class(Export3DS)
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 47228c60..ff742a60 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -5,7 +5,7 @@
 bl_info = {
     'name': 'glTF 2.0 format',
     'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (4, 2, 0),
+    "version": (4, 1, 60),
     'blender': (4, 1, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',
-- 
2.11.4.GIT