godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Revert follow-ups to #102313 before reverting that PR

Browse Source 
This reverts the following commits:

- cd6e5ba9f4
- d36a3e5c06
- f2c6d16290
- aae51963ef
This commit is contained in:
Rémi Verschelde
2025-06-20 23:03:22 +02:00
parent 48f361a6eb
commit 6af4ef019c
3 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
editor/editor_node.cpp
View File

@@ -1998,7 +1998,7 @@ void EditorNode::_save_scene_silently() {
// when Save on Focus Loss kicks in.
Node *scene = editor_data.get_edited_scene_root();
if (scene && !scene->get_scene_file_path().is_empty() && DirAccess::exists(scene->get_scene_file_path().get_base_dir())) {
_save_scene(scene->get_scene_file_path(), -1, false);
_save_scene(scene->get_scene_file_path());
save_editor_layout_delayed();
}
}
@@ -2026,29 +2026,23 @@ static void _reset_animation_mixers(Node *p_node, List<Pair<AnimationMixer *, Re
}
}
void EditorNode::_save_scene(String p_file, int idx, bool show_progress) {
void EditorNode::_save_scene(String p_file, int idx) {
ERR_FAIL_COND_MSG(!saving_scene.is_empty() && saving_scene == p_file, "Scene saved while already being saved!");
Node *scene = editor_data.get_edited_scene_root(idx);
if (show_progress) {
save_scene_progress = memnew(EditorProgress("save", TTR("Saving Scene"), 3));
save_scene_progress->step(TTR("Analyzing"), 0);
}
save_scene_progress = memnew(EditorProgress("save", TTR("Saving Scene"), 3));
save_scene_progress->step(TTR("Analyzing"), 0);
if (!scene) {
show_accept(TTR("This operation can't be done without a tree root."), TTR("OK"));
if (show_progress) {
_close_save_scene_progress();
}
_close_save_scene_progress();
return;
}
if (!scene->get_scene_file_path().is_empty() && _validate_scene_recursive(scene->get_scene_file_path(), scene)) {
show_accept(TTR("This scene can't be saved because there is a cyclic instance inclusion.\nPlease resolve it and then attempt to save again."), TTR("OK"));
if (show_progress) {
_close_save_scene_progress();
}
_close_save_scene_progress();
return;
}
@@ -2060,9 +2054,7 @@ void EditorNode::_save_scene(String p_file, int idx, bool show_progress) {
_reset_animation_mixers(scene, &anim_backups);
_save_editor_states(p_file, idx);
if (show_progress) {
save_scene_progress->step(TTR("Packing Scene"), 1);
}
save_scene_progress->step(TTR("Packing Scene"), 1);
Ref<PackedScene> sdata;
@@ -2084,15 +2076,11 @@ void EditorNode::_save_scene(String p_file, int idx, bool show_progress) {
if (err != OK) {
show_accept(TTR("Couldn't save scene. Likely dependencies (instances or inheritance) couldn't be satisfied."), TTR("OK"));
if (show_progress) {
_close_save_scene_progress();
}
_close_save_scene_progress();
return;
}
if (show_progress) {
save_scene_progress->step(TTR("Saving scene"), 2);
}
save_scene_progress->step(TTR("Saving scene"), 2);
int flg = 0;
if (EDITOR_GET("filesystem/on_save/compress_binary_resources")) {
@@ -2106,9 +2094,7 @@ void EditorNode::_save_scene(String p_file, int idx, bool show_progress) {
emit_signal(SNAME("scene_saved"), p_file);
editor_data.notify_scene_saved(p_file);
if (show_progress) {
save_scene_progress->step(TTR("Saving external resources"), 3);
}
save_scene_progress->step(TTR("Saving external resources"), 3);
_save_external_resources();
saving_scene = p_file; // Some editors may save scenes of built-in resources as external data, so avoid saving this scene again.
@@ -2134,9 +2120,7 @@ void EditorNode::_save_scene(String p_file, int idx, bool show_progress) {
scene->propagate_notification(NOTIFICATION_EDITOR_POST_SAVE);
_update_unsaved_cache();
if (show_progress) {
_close_save_scene_progress();
}
_close_save_scene_progress();
}
void EditorNode::save_all_scenes() {
@@ -2176,7 +2160,7 @@ void EditorNode::try_autosave() {
Node *scene = editor_data.get_edited_scene_root();
if (scene && !scene->get_scene_file_path().is_empty()) { // Only autosave if there is a scene and if it has a path.
_save_scene(scene->get_scene_file_path(), -1, false);
_save_scene(scene->get_scene_file_path());
}
}
_menu_option(SCENE_SAVE_ALL_SCENES);

2
editor/editor_node.h
View File

@@ -592,7 +592,7 @@ private:
void _set_current_scene(int p_idx);
void _set_current_scene_nocheck(int p_idx);
bool _validate_scene_recursive(const String &p_filename, Node *p_node);
void _save_scene(String p_file, int idx = -1, bool show_progress = true);
void _save_scene(String p_file, int idx = -1);
void _save_all_scenes();
int _next_unsaved_scene(bool p_valid_filename, int p_start = 0);
void _discard_changes(const String &p_str = String());

21
editor/plugins/editor_preview_plugins.cpp
View File

@@ -324,7 +324,7 @@ Ref<Texture2D> EditorPackedScenePreviewPlugin::generate_from_path(const String &
aborted = false;
Error load_error;
Ref<PackedScene> pack = ResourceLoader::load(p_path, "PackedScene", ResourceFormatLoader::CACHE_MODE_IGNORE_DEEP, &load_error); // no more cache issues?
Ref<PackedScene> pack = ResourceLoader::load(p_path, "PackedScene", ResourceFormatLoader::CACHE_MODE_IGNORE, &load_error); // no more cache issues?
if (load_error != OK) {
print_error(vformat("Failed to generate scene thumbnail for %s : Loaded with error code %d", p_path, int(load_error)));
return Ref<Texture2D>();
@@ -342,11 +342,6 @@ Ref<Texture2D> EditorPackedScenePreviewPlugin::generate_from_path(const String &
Node *p_scene = pack->instantiate(); // The instantiated preview scene
if (!p_scene) {
print_error(vformat("Failed to generate scene thumbnail for %s : Failed to instantiate scene", p_path));
return Ref<Texture2D>();
}
// Prohibit Viewport class as root when generating thumbnails
if (Object::cast_to<Viewport>(p_scene)) {
p_scene->queue_free();
@@ -588,6 +583,13 @@ Ref<Texture2D> EditorPackedScenePreviewPlugin::generate_from_path(const String &
}
void EditorPackedScenePreviewPlugin::_setup_scene_3d(Node *p_node) const {
// Do not account any SubViewport at preview scene, as it would not render correctly
if (Object::cast_to<SubViewport>(p_node) && p_node->get_parent()) {
p_node->get_parent()->remove_child(p_node);
callable_mp(p_node, &Node::queue_free).call_deferred();
return;
}
// Don't let window to popup
Window *window = Object::cast_to<Window>(p_node);
if (window) {
@@ -637,6 +639,13 @@ void EditorPackedScenePreviewPlugin::_setup_scene_3d(Node *p_node) const {
}
void EditorPackedScenePreviewPlugin::_setup_scene_2d(Node *p_node) const {
// Do not account any SubViewport at preview scene, as it would not render correctly
if (Object::cast_to<SubViewport>(p_node) && p_node->get_parent()) {
p_node->get_parent()->remove_child(p_node);
callable_mp(p_node, &Node::queue_free).call_deferred();
return;
}
// Don't let window to popup
Window *window = Object::cast_to<Window>(p_node);
if (window) {