From 81a79e0c0e80aafd2c8a4d250202328176da676e Mon Sep 17 00:00:00 2001
From: volzhs <volzhs@gmail.com>
Date: Sun, 10 Dec 2017 08:01:00 +0900
Subject: [PATCH] Fix get_edited_scene_root error at starting editor

---
 editor/plugins/canvas_item_editor_plugin.cpp | 2 +-
 editor/plugins/tile_set_editor_plugin.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index e63bc3ad9fb..150c184e901 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -4344,7 +4344,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	additive_selection = false;
 
 	// Update the menus checkboxes
-	set_state(get_state());
+	call_deferred("set_state", get_state());
 }
 
 CanvasItemEditor *CanvasItemEditor::singleton = NULL;
diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp
index eb2faa1ab11..b8c57fd9597 100644
--- a/editor/plugins/tile_set_editor_plugin.cpp
+++ b/editor/plugins/tile_set_editor_plugin.cpp
@@ -343,7 +343,7 @@ AutotileEditor::AutotileEditor(EditorNode *p_editor) {
 	split->add_child(property_editor);
 
 	helper = memnew(AutotileEditorHelper(this));
-	property_editor->edit(helper);
+	property_editor->call_deferred("edit", helper);
 
 	// Editor