From f6575f8d9a89241affb0bdc995189f4a29072f4e Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 15 Aug 2017 19:05:13 -0300 Subject: [PATCH] Fixes crash related to animatio editor, closes #8687 (cherry picked from commit cf2fdcb63e9b7be6b2aab2e9e0989cbd9aca704b) --- editor/animation_editor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index 51a1a228d1c..0627e1efd56 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -1294,7 +1294,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(); @@ -1319,7 +1319,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;