asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11472 from groud/fix_canvasitemeditor_nullchecks

Browse source 
Fix godot spraying errors about a null check

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-09-21 23:31:41 +02:00 committed by GitHub
commit b51180caa3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -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());