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

Merge pull request #78124 from KoBeWi/leave_MeshLibrary_alone 

Fix problems reloading MeshLibrary
This commit is contained in:
Rémi Verschelde 2023-06-12 11:57:07 +02:00
parent 8f575d2991 0a4d0506d1
commit 2c5f259cf5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_node.cpp
View File

@ -2027,6 +2027,9 @@ void EditorNode::_dialog_action(String p_file) {
if (err) { if (err) {
show_accept(TTR("Error saving MeshLibrary!"), TTR("OK")); show_accept(TTR("Error saving MeshLibrary!"), TTR("OK"));
return; return;
} else if (ResourceCache::has(p_file)) {
// Make sure MeshLibrary is updated in the editor.
ResourceLoader::load(p_file)->reload_from_file();
} }
} break; } break;

1
editor/plugins/mesh_library_editor_plugin.cpp
View File

@ -301,6 +301,7 @@ void MeshLibraryEditorPlugin::edit(Object *p_node) {
mesh_library_editor->edit(Object::cast_to<MeshLibrary>(p_node)); mesh_library_editor->edit(Object::cast_to<MeshLibrary>(p_node));
mesh_library_editor->show(); mesh_library_editor->show();
} else { } else {
mesh_library_editor->edit(Ref<MeshLibrary>());
mesh_library_editor->hide(); mesh_library_editor->hide();
} }
} }