summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-07-03 15:26:35 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-07-03 15:26:35 +0200
commit73a529df4cf164fa892b4ce9520be27c592afe9c (patch)
tree681b705b05f237634b9e9a05dbbbaa80a7af571e
parent1b38e9258bbfe68d3c239f4f1d0ef1919ccd5a53 (diff)
parent93791772868f2d392d4956997d4d539e64828479 (diff)
downloadredot-engine-73a529df4cf164fa892b4ce9520be27c592afe9c.tar.gz
Merge pull request #78980 from KoBeWi/demise_of_a_fix
Fix node selection not handled correctly at launch
-rw-r--r--editor/editor_data.cpp5
-rw-r--r--editor/editor_data.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index be7376a5c4..af7163eec1 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -925,7 +925,6 @@ Dictionary EditorData::restore_edited_scene_state(EditorSelection *p_selection,
for (Node *E : es.selection) {
p_selection->add_node(E);
}
- p_selection->cancel_update(); // Selection update results in redundant Node edit, so we cancel it.
set_editor_plugin_states(es.editor_states);
return es.custom_state;
@@ -1350,10 +1349,6 @@ void EditorSelection::clear() {
node_list_changed = true;
}
-void EditorSelection::cancel_update() {
- changed = false;
-}
-
EditorSelection::EditorSelection() {
}
diff --git a/editor/editor_data.h b/editor/editor_data.h
index 400cbb0536..28fe13e537 100644
--- a/editor/editor_data.h
+++ b/editor/editor_data.h
@@ -312,7 +312,6 @@ public:
void update();
void clear();
- void cancel_update();
// Returns all the selected nodes.
TypedArray<Node> get_selected_nodes();