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

Merge pull request #15480 from StateOff/fixes_deleted_nodes_in_history 

Fixes #15416 - "The deleted nodes are hanging in the inspector."
This commit is contained in:
Rémi Verschelde 2018-01-08 14:28:25 +01:00 committed by GitHub
parent 11cc703810 9d3eb3d2b0
commit 8f4140c9c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/editor_data.cpp
View File

@ -38,7 +38,7 @@
#include "project_settings.h"
#include "scene/resources/packed_scene.h"
void EditorHistory::_cleanup_history() {
void EditorHistory::cleanup_history() {
for (int i = 0; i < history.size(); i++) {
@ -48,8 +48,14 @@ void EditorHistory::_cleanup_history() {
if (!history[i].path[j].ref.is_null())
continue;
if (ObjectDB::get_instance(history[i].path[j].object))
continue; //has isntance, try next
Object *obj = ObjectDB::get_instance(history[i].path[j].object);
if (obj) {
Node *n = Object::cast_to<Node>(obj);
if (n && n->is_inside_tree())
continue;
if (!n) // Possibly still alive
continue;
}
if (j <= history[i].level) {
//before or equal level, complete fail
@ -152,7 +158,7 @@ bool EditorHistory::is_at_end() const {
bool EditorHistory::next() {
_cleanup_history();
cleanup_history();
if ((current + 1) < history.size())
current++;
@ -164,7 +170,7 @@ bool EditorHistory::next() {
bool EditorHistory::previous() {
_cleanup_history();
cleanup_history();
if (current > 0)
current--;

4
editor/editor_data.h
View File

@ -70,11 +70,11 @@ class EditorHistory {
Variant value;
};
void _cleanup_history();
void _add_object(ObjectID p_object, const String &p_property, int p_level_change);
public:
void cleanup_history();
bool is_at_beginning() const;
bool is_at_end() const;

2
editor/editor_node.cpp
View File

@ -1398,7 +1398,7 @@ void EditorNode::_property_editor_forward() {
}
void EditorNode::_property_editor_back() {
if (editor_history.previous())
if (editor_history.previous() || editor_history.get_path_size() == 1)
_edit_current();
}

5
editor/scene_tree_dock.cpp
View File

@ -1285,6 +1285,11 @@ void SceneTreeDock::_delete_confirm() {
editor->get_viewport_control()->update();
editor->push_item(NULL);
// Fixes the EditorHistory from still offering deleted notes
EditorHistory *editor_history = EditorNode::get_singleton()->get_editor_history();
editor_history->cleanup_history();
EditorNode::get_singleton()->call("_prepare_history");
}
void SceneTreeDock::_selection_changed() {