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

Merge pull request #19713 from volzhs/fix-crash-nodepath-animation-edit

Browse source 
Fix crash when assigning a node on editing animation key
This commit is contained in:
Max Hilbrunner 2018-07-05 04:20:40 +02:00 committed by GitHub
commit 073e77454d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/animation_track_editor.cpp
View file

@ -25,6 +25,7 @@ public:
ClassDB::bind_method("_update_obj", &AnimationTrackKeyEdit::_update_obj);
ClassDB::bind_method("_key_ofs_changed", &AnimationTrackKeyEdit::_key_ofs_changed);
ClassDB::bind_method("_hide_script_from_inspector", &AnimationTrackKeyEdit::_hide_script_from_inspector);
ClassDB::bind_method("get_root_path", &AnimationTrackKeyEdit::get_root_path);
}
//PopupDialog *ke_dialog;
@ -612,6 +613,10 @@ public:
_change_notify();
}
Node *get_root_path() {
return root_path;
}
AnimationTrackKeyEdit() {
hidden = true;
key_ofs = 0;

9
editor/editor_properties.cpp
View file

@ -1522,8 +1522,15 @@ EditorPropertyColor::EditorPropertyColor() {
void EditorPropertyNodePath::_node_selected(const NodePath &p_path) {
NodePath path = p_path;
Node *base_node = Object::cast_to<Node>(get_edited_object());
emit_signal("property_changed", get_edited_property(), base_node->get_path().rel_path_to(p_path));
if (base_node == NULL && 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);
}
emit_signal("property_changed", get_edited_property(), path);
update_property();
}