diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-15 19:05:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-08-15 19:05:57 -0300 |
| commit | cf2fdcb63e9b7be6b2aab2e9e0989cbd9aca704b (patch) | |
| tree | 2e2cfd3ca647b38c5f1b398c0a685f09978707e3 | |
| parent | 41d8ddf7c4d226cf98119a9fe65debdcfdef2599 (diff) | |
| download | redot-engine-cf2fdcb63e9b7be6b2aab2e9e0989cbd9aca704b.tar.gz | |
Fixes crash related to animatio editor, closes #8687
| -rw-r--r-- | editor/animation_editor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index 3675948b1d..1571131aee 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -1299,7 +1299,7 @@ void AnimationKeyEditor::_track_editor_draw() { Object *obj = NULL; RES res; - Node *node = root->get_node_and_resource(animation->track_get_path(idx), res); + Node *node = root ? root->get_node_and_resource(animation->track_get_path(idx), res) : (Node *)NULL; if (res.is_valid()) { obj = res.ptr(); @@ -1324,7 +1324,7 @@ void AnimationKeyEditor::_track_editor_draw() { te->draw_texture(type_icon[animation->track_get_type(idx)], ofs + Point2(0, y + (h - type_icon[0]->get_height()) / 2).floor()); NodePath np = animation->track_get_path(idx); - Node *n = root->get_node(np); + Node *n = root ? root->get_node(np) : (Node *)NULL; Color ncol = color; if (n && editor_selection->is_selected(n)) ncol = track_select_color; |