aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde2017-09-21 23:31:41 +0200
committerGitHub2017-09-21 23:31:41 +0200
commitb51180caa3063937d2155233fd0bf8155c317ba9 (patch)
tree250b49bd9fa543359dacbdd5ed6f864032972d97
parentbf371dcb3294027c209cc40a42fdbf438d4261af (diff)
parente2145bc960333b996c5d6e7b96a161308a779c41 (diff)
downloadgodot-b51180caa3063937d2155233fd0bf8155c317ba9.tar.gz
godot-b51180caa3063937d2155233fd0bf8155c317ba9.tar.zst
godot-b51180caa3063937d2155233fd0bf8155c317ba9.zip
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index bc5f11e73..e621394a0 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());