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

Make it smarter to infer paths from history data, closes #20005

Browse Source
This commit is contained in:
Juan Linietsky
2018-11-21 09:22:47 -03:00
parent 78624ad22c
commit 894163a945
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editor/editor_properties.cpp
View File

@ -1802,14 +1802,26 @@ void EditorPropertyNodePath::_node_selected(const NodePath &p_path) {
NodePath path = p_path; NodePath path = p_path;
Node *base_node = Object::cast_to<Node>(get_edited_object()); Node *base_node = Object::cast_to<Node>(get_edited_object());
if (base_node == NULL) { if (!base_node) {
if (Object::cast_to<Resource>(get_edited_object())) { //try a base node within history
Node *to_node = get_node(p_path); if (EditorNode::get_singleton()->get_editor_history()->get_path_size() > 0) {
path = get_tree()->get_edited_scene_root()->get_path_to(to_node); Object *base = ObjectDB::get_instance(EditorNode::get_singleton()->get_editor_history()->get_path_object(0));
} else if (get_edited_object()->has_method("get_root_path")) { if (base) {
base_node = get_edited_object()->call("get_root_path"); base_node = Object::cast_to<Node>(base);
}
} }
} }
if (!base_node && get_edited_object()->has_method("get_root_path")) {
base_node = get_edited_object()->call("get_root_path");
}
if (!base_node && Object::cast_to<Reference>(get_edited_object())) {
Node *to_node = get_node(p_path);
ERR_FAIL_COND(!to_node);
path = get_tree()->get_edited_scene_root()->get_path_to(to_node);
}
if (base_node) { // for AnimationTrackKeyEdit if (base_node) { // for AnimationTrackKeyEdit
path = base_node->get_path().rel_path_to(p_path); path = base_node->get_path().rel_path_to(p_path);
} }