Improved 3D Asset Import Dialog material editing

Implements [7238](godotengine/godot-proposals#7238) (for the most part). * Ability to select nodes, meshes or materials by clicking. * Moved mesh/material previews to the inspector area. * Ability to override materials and edit them directly in the inspector. * By default, shows overridden materials in the imported scene, with a button to disable them and show original materials. * Keeps compatibility with the old override format.
reduz · Jan 26, 2024 · 4a461df · 4a461df
1 parent 17e7f85
commit 4a461df
Show file tree

Hide file tree

Showing 15 changed files with 586 additions and 139 deletions.
diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp
@@ -107,13 +107,13 @@ void TriangleMesh::get_indices(Vector<int> *r_triangles_indices) const {
 void TriangleMesh::create(const Vector<Vector3> &p_faces, const Vector<int32_t> &p_surface_indices) {
 	valid = false;
 
-	ERR_FAIL_COND(p_surface_indices.size() && p_surface_indices.size() != p_faces.size());
-
 	int fc = p_faces.size();
 	ERR_FAIL_COND(!fc || ((fc % 3) != 0));
 	fc /= 3;
 	triangles.resize(fc);
 
+	ERR_FAIL_COND(p_surface_indices.size() && p_surface_indices.size() != triangles.size());
+
 	bvh.resize(fc * 3); //will never be larger than this (todo make better)
 	BVH *bw = bvh.ptrw();
 

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -1284,7 +1284,7 @@ void EditorNode::save_resource(const Ref<Resource> &p_resource) {
 	if (path.is_resource_file() && !FileAccess::exists(path + ".import")) {
 		save_resource_in_path(p_resource, p_resource->get_path());
 	} else {
-		save_resource_as(p_resource);
+		save_resource_as(p_resource, "");
 	}
 }
 

diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
@@ -398,13 +398,15 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
 			if (edited_resource.is_null()) {
 				return;
 			}
+
 			EditorNode::get_singleton()->save_resource(edited_resource);
 		} break;
 
 		case OBJ_MENU_SAVE_AS: {
 			if (edited_resource.is_null()) {
 				return;
 			}
+
 			EditorNode::get_singleton()->save_resource_as(edited_resource);
 		} break;
 

diff --git a/editor/icons/MaterialSelect.svg b/editor/icons/MaterialSelect.svg
diff --git a/editor/icons/MaterialSelectDisabled.svg b/editor/icons/MaterialSelectDisabled.svg
diff --git a/editor/icons/MeshSelect.svg b/editor/icons/MeshSelect.svg
diff --git a/editor/icons/NodeSelect.svg b/editor/icons/NodeSelect.svg
diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp
@@ -1192,13 +1192,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);
 							}
 
+							// Old style material, keep for compatibility.
 							if (matdata.has("use_external/enabled") && bool(matdata["use_external/enabled"]) && matdata.has("use_external/path")) {
 								String path = matdata["use_external/path"];
 								Ref<Material> external_mat = ResourceLoader::load(path);
 								if (external_mat.is_valid()) {
 									m->set_surface_material(i, external_mat);
 								}
 							}
+							// New style custom material
+							if (matdata.has("custom")) {
+								Ref<Material> external_mat = matdata["custom"];
+								if (external_mat.is_valid()) {
+									m->set_surface_material(i, external_mat);
+								}
+							}
 						}
 					}
 				}
@@ -1708,8 +1716,11 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
 			r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "lods/normal_merge_angle", PROPERTY_HINT_RANGE, "0,180,0.1,degrees"), 60.0f));
 		} break;
 		case INTERNAL_IMPORT_CATEGORY_MATERIAL: {
-			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "use_external/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
-			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "use_external/path", PROPERTY_HINT_FILE, "*.material,*.res,*.tres"), ""));
+			// Compatibility (hidden) settings.
+			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "use_external/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), false));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "use_external/path", PROPERTY_HINT_FILE, "*.material,*.res,*.tres", PROPERTY_USAGE_NONE), ""));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "custom", PROPERTY_HINT_RESOURCE_TYPE, "BaseMaterial3D,ShaderMaterial"), Ref<Material>()));
+
 		} break;
 		case INTERNAL_IMPORT_CATEGORY_ANIMATION: {
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "settings/loop_mode", PROPERTY_HINT_ENUM, "None,Linear,Pingpong"), 0));