asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #23313 from DavidSichma/viewport-reassign

Browse source 
Handling NodePaths in in-place Editor for Resources
This commit is contained in:
Juan Linietsky 2018-11-01 13:59:59 -03:00 committed by GitHub
commit 74d895425d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/editor_properties.cpp
View file

@ -1802,8 +1802,13 @@ void EditorPropertyNodePath::_node_selected(const NodePath &p_path) {
NodePath path = p_path;
Node *base_node = Object::cast_to<Node>(get_edited_object());
if (base_node == NULL && get_edited_object()->has_method("get_root_path")) {
base_node = get_edited_object()->call("get_root_path");
if (base_node == NULL) {
if (Object::cast_to<Resource>(get_edited_object())) {
Node *to_node = get_node(p_path);
path = get_tree()->get_edited_scene_root()->get_path_to(to_node);
} else if (get_edited_object()->has_method("get_root_path")) {
base_node = get_edited_object()->call("get_root_path");
}
}
if (base_node) { // for AnimationTrackKeyEdit
path = base_node->get_path().rel_path_to(p_path);