diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-10 00:12:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-10 00:12:42 +0100 |
| commit | 4fd26d89c1ea3c5221bf3040a505eecd45f4bf61 (patch) | |
| tree | 402e6695c2c8ef820a71c409003a288e86cac0a5 | |
| parent | aeae05a2f40e5759b68f1675b3f41a6643627214 (diff) | |
| parent | 81a79e0c0e80aafd2c8a4d250202328176da676e (diff) | |
Merge pull request #14480 from volzhs/startup-error
Fix get_edited_scene_root error at starting editor
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | 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 e63bc3ad9f..150c184e90 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 eb2faa1ab1..b8c57fd959 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 |