Browse Source

Merge pull request #11472 from groud/fix_canvasitemeditor_nullchecks

Fix godot spraying errors about a null check

[ci skip]
Rémi Verschelde 8 years ago
parent
commit
b51180caa3
1 changed files with 2 additions and 1 deletions
  1. 2 1
      editor/plugins/canvas_item_editor_plugin.cpp

+ 2 - 1
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());