Skip to content

Commit

Permalink
Merge pull request godotengine#75636 from lyuma/advanced_importer_ext…
Browse files Browse the repository at this point in the history
…ract_textures_fix

gltf: Remove obsolete hack to embed gltf textures in advanced import
  • Loading branch information
akien-mga committed Apr 5, 2023
2 parents e0bff2f + bd020b7 commit b837507
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions editor/import/resource_importer_scene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2298,11 +2298,6 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file, const HashM
Error err = OK;
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);
if (!scene || err != OK) {
return nullptr;
Expand Down

0 comments on commit b837507

Please sign in to comment.