diff options
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index b6c97f0c8f..32da37ad27 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1047,11 +1047,6 @@ void EditorNode::_sources_changed(bool p_exist) { // loading textures, as they are now properly imported. RenderingServer::get_singleton()->global_shader_parameters_load_settings(true); - // Start preview thread now that it's safe. - if (!singleton->cmdline_export_mode) { - EditorResourcePreview::get_singleton()->start(); - } - _load_editor_layout(); if (!defer_load_scene.is_empty()) { @@ -1066,6 +1061,11 @@ void EditorNode::_sources_changed(bool p_exist) { if (SurfaceUpgradeTool::get_singleton()->is_show_requested()) { SurfaceUpgradeTool::get_singleton()->show_popup(); } + + // Start preview thread now that it's safe. + if (!singleton->cmdline_export_mode) { + EditorResourcePreview::get_singleton()->start(); + } } } @@ -3055,7 +3055,7 @@ void EditorNode::_tool_menu_option(int p_idx) { orphan_resources->show(); } break; case TOOLS_SURFACE_UPGRADE: { - surface_upgrade_dialog->popup_centered(Size2(750 * EDSCALE, 0)); + surface_upgrade_dialog->popup_on_demand(); } break; case TOOLS_CUSTOM: { if (tool_menu->get_item_submenu(p_idx) == "") { |