seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #98909 from demolke/master

Browse Source 
GLTF: Don't duplicate textures when importing blend files
This commit is contained in:
Rémi Verschelde
2025-01-06 22:46:44 +01:00
parent c78d9d2fe7 e649e7e3c5
commit ba8a155551
13 changed files with 846 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
editor/import/editor_import_plugin.cpp
View File

@ -214,6 +214,7 @@ Error EditorImportPlugin::_append_import_external_resource(const String &p_file,
}
Error EditorImportPlugin::append_import_external_resource(const String &p_file, const HashMap<StringName, Variant> &p_custom_options, const String &p_custom_importer, Variant p_generator_parameters) {
ERR_FAIL_COND_V_MSG(!EditorFileSystem::get_singleton()->is_importing(), ERR_INVALID_PARAMETER, "Can only append files to import during a current reimport process.");
return EditorFileSystem::get_singleton()->reimport_append(p_file, p_custom_options, p_custom_importer, p_generator_parameters);
}