godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14480 from volzhs/startup-error

Browse Source 
Fix get_edited_scene_root error at starting editor
This commit is contained in:
Rémi Verschelde 2017-12-10 00:12:42 +01:00 committed by GitHub
commit 4fd26d89c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

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

2
editor/plugins/tile_set_editor_plugin.cpp
View File

@ -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