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

Merge pull request #75636 from lyuma/advanced_importer_extract_textures_fix 

gltf: Remove obsolete hack to embed gltf textures in advanced import
This commit is contained in:
Rémi Verschelde 2023-04-05 12:03:27 +02:00
parent e0bff2fa06 bd020b7d92
commit b8375071b0
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/import/resource_importer_scene.cpp
View File

@ -2298,11 +2298,6 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file, const HashM
Error err = OK; Error err = OK;
HashMap<StringName, Variant> options_dupe = p_options; HashMap<StringName, Variant> options_dupe = p_options;
// By default, the GLTF importer will extract embedded images into files on disk
// However, we do not want the advanced settings dialog to be able to write files on disk.
// To avoid this and also avoid compressing to basis every time, we are using the uncompressed option.
options_dupe["gltf/embedded_image_handling"] = 3; // Embed as Uncompressed defined in GLTFState::GLTFHandleBinary::HANDLE_BINARY_EMBED_AS_UNCOMPRESSED
Node *scene = importer->import_scene(p_source_file, EditorSceneFormatImporter::IMPORT_ANIMATION | EditorSceneFormatImporter::IMPORT_GENERATE_TANGENT_ARRAYS, options_dupe, nullptr, &err); Node *scene = importer->import_scene(p_source_file, EditorSceneFormatImporter::IMPORT_ANIMATION | EditorSceneFormatImporter::IMPORT_GENERATE_TANGENT_ARRAYS, options_dupe, nullptr, &err);
if (!scene || err != OK) { if (!scene || err != OK) {
return nullptr; return nullptr;