Skip to content

Fix extracting materials without a per-material override #120870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronfranke wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −13
Open

Fix extracting materials without a per-material override #120870

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 39 additions & 13 deletions editor/import/3d/resource_importer_scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1612,12 +1612,35 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
continue;
}
const String mat_id = mat->get_meta("import_id", mat->get_name());
if (mat_id.is_empty() || !p_material_data.has(mat_id)) {
if (mat_id.is_empty()) {
continue;
}
Dictionary matdata = p_material_data[mat_id];
// Start with per-material import settings, if any. This is populated by the
// Advanced Import Settings dialog, but may be empty when using only the Import dock.
Dictionary matdata;
if (p_material_data.has(mat_id)) {
matdata = p_material_data[mat_id];
}
String file_path;
// Read any existing "use_external" settings to get the enabled status and file path.
if (matdata.has("use_external/enabled")) {
const bool enabled = bool(matdata["use_external/enabled"]);
// If the user has explicitly overwrote this material to not be external, skip it.
if (!enabled) {
continue;
}
// Read any existing file path from this material's import settings, if present.
if (matdata.has("use_external/fallback_path")) {
file_path = matdata["use_external/fallback_path"];
} else if (matdata.has("use_external/path")) {
file_path = matdata["use_external/path"];
if (file_path.begins_with("uid://")) {
file_path = ResourceUID::get_singleton()->uid_to_path(file_path);
}
}
}
// For any material settings that are missing, fill them with default values.
{
//fill node settings for this node with default values
List<ImportOption> iopts;
get_internal_import_options(INTERNAL_IMPORT_CATEGORY_MATERIAL, &iopts);
for (const ImportOption &E : iopts) {
Expand All @@ -1630,18 +1653,21 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
post_importer_plugins.write[j]->internal_process(EditorScenePostImportPlugin::INTERNAL_IMPORT_CATEGORY_MATERIAL, p_root, p_node, mat, matdata);
}
if (extract_mat != 0) {
const String ext = material_extension[p_options.has("materials/extract_format") ? (int)p_options["materials/extract_format"] : 0];
const String path = spath.path_join(mat_id.validate_filename() + ext);
const String uid_path = ResourceUID::path_to_uid(path);

matdata["use_external/enabled"] = true;
matdata["use_external/path"] = uid_path;
matdata["use_external/fallback_path"] = path;
if (!FileAccess::exists(path) || extract_mat == 2 /*overwrite*/) {
ResourceSaver::save(mat, path);
// If no file path was specified, generate one based on the material name and the selected format.
if (file_path.is_empty()) {
const String ext = material_extension[p_options.has("materials/extract_format") ? (int)p_options["materials/extract_format"] : 0];
file_path = spath.path_join(mat_id.validate_filename() + ext);
const String uid_path = ResourceUID::path_to_uid(file_path);
matdata["use_external/enabled"] = true;
matdata["use_external/path"] = uid_path;
matdata["use_external/fallback_path"] = file_path;
}
// Write the file if it doesn't exist, or if the user has selected to overwrite existing files.
if (!FileAccess::exists(file_path) || extract_mat == 2 /*overwrite*/) {
ResourceSaver::save(mat, file_path);
}

Ref<Material> external_mat = ResourceLoader::load(path, "", ResourceFormatLoader::CACHE_MODE_REPLACE);
Ref<Material> external_mat = ResourceLoader::load(file_path, "", ResourceFormatLoader::CACHE_MODE_REPLACE);
if (external_mat.is_valid()) {
m->set_surface_material(i, external_mat);
}
Expand Down