diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-21 23:31:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 23:31:41 +0200 |
| commit | b51180caa3063937d2155233fd0bf8155c317ba9 (patch) | |
| tree | 250b49bd9fa543359dacbdd5ed6f864032972d97 | |
| parent | bf371dcb3294027c209cc40a42fdbf438d4261af (diff) | |
| parent | e2145bc960333b996c5d6e7b96a161308a779c41 (diff) | |
Merge pull request #11472 from groud/fix_canvasitemeditor_nullchecks
Fix godot spraying errors about a null check
[ci skip]
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 3 |
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 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()); |