Merge branch 'blender-v4.5-release'
This commit is contained in:
@@ -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": (5, 0, 15),
|
||||
"version": (5, 0, 16),
|
||||
'blender': (4, 4, 0),
|
||||
'location': 'File > Import-Export',
|
||||
'description': 'Import-Export as glTF 2.0',
|
||||
@@ -1850,6 +1850,11 @@ class ImportGLTF2(Operator, ConvertGLTF2_Base, ImportHelper):
|
||||
|
||||
filter_glob: StringProperty(default="*.glb;*.gltf", options={'HIDDEN'})
|
||||
|
||||
directory: StringProperty(
|
||||
subtype='DIR_PATH',
|
||||
options={'HIDDEN', 'SKIP_PRESET'},
|
||||
)
|
||||
|
||||
files: CollectionProperty(
|
||||
name="File Path",
|
||||
type=bpy.types.OperatorFileListElement,
|
||||
@@ -2027,9 +2032,8 @@ class ImportGLTF2(Operator, ConvertGLTF2_Base, ImportHelper):
|
||||
if self.files:
|
||||
# Multiple file import
|
||||
ret = {'CANCELLED'}
|
||||
dirname = os.path.dirname(self.filepath)
|
||||
for file in self.files:
|
||||
path = os.path.join(dirname, file.name)
|
||||
path = os.path.join(self.directory, file.name)
|
||||
if self.unit_import(path, import_settings) == {'FINISHED'}:
|
||||
ret = {'FINISHED'}
|
||||
return ret
|
||||
|
||||
Reference in New Issue
Block a user