From e2145bc960333b996c5d6e7b96a161308a779c41 Mon Sep 17 00:00:00 2001 From: Gilles Roudiere Date: Thu, 21 Sep 2017 21:59:38 +0200 Subject: Fix godot spraying errors about a null check --- editor/plugins/canvas_item_editor_plugin.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'editor/plugins') diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index bc5f11e734..e621394a07 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -2693,7 +2693,8 @@ void CanvasItemEditor::_draw_viewport() { _draw_grid(); _draw_selection(); _draw_axis(); - _draw_locks_and_groups(editor->get_edited_scene(), transform); + if (editor->get_edited_scene()) + _draw_locks_and_groups(editor->get_edited_scene(), transform); RID ci = viewport->get_canvas_item(); VisualServer::get_singleton()->canvas_item_add_set_transform(ci, Transform2D()); -- cgit v1.2.3