Browse Source

Merge pull request #14480 from volzhs/startup-error

Fix get_edited_scene_root error at starting editor
Rémi Verschelde 7 năm trước cách đây
mục cha
commit
4fd26d89c1

+ 1 - 1
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;

+ 1 - 1
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