|
@@ -291,6 +291,8 @@ void EditorNode::_notification(int p_what) {
|
|
get_tree()->get_root()->set_as_audio_listener_2d(false);
|
|
get_tree()->get_root()->set_as_audio_listener_2d(false);
|
|
get_tree()->set_auto_accept_quit(false);
|
|
get_tree()->set_auto_accept_quit(false);
|
|
get_tree()->connect("files_dropped", this, "_dropped_files");
|
|
get_tree()->connect("files_dropped", this, "_dropped_files");
|
|
|
|
+
|
|
|
|
+ /* DO NOT LOAD SCENES HERE, WAIT FOR FILE SCANNING AND REIMPORT TO COMPLETE */
|
|
}
|
|
}
|
|
|
|
|
|
if (p_what == NOTIFICATION_EXIT_TREE) {
|
|
if (p_what == NOTIFICATION_EXIT_TREE) {
|
|
@@ -305,7 +307,8 @@ void EditorNode::_notification(int p_what) {
|
|
|
|
|
|
_editor_select(EDITOR_3D);
|
|
_editor_select(EDITOR_3D);
|
|
_update_debug_options();
|
|
_update_debug_options();
|
|
- _load_docks();
|
|
|
|
|
|
+
|
|
|
|
+ /* DO NOT LOAD SCENES HERE, WAIT FOR FILE SCANNING AND REIMPORT TO COMPLETE */
|
|
}
|
|
}
|
|
|
|
|
|
if (p_what == MainLoop::NOTIFICATION_WM_FOCUS_IN) {
|
|
if (p_what == MainLoop::NOTIFICATION_WM_FOCUS_IN) {
|
|
@@ -528,6 +531,8 @@ void EditorNode::_sources_changed(bool p_exist) {
|
|
|
|
|
|
if (waiting_for_first_scan) {
|
|
if (waiting_for_first_scan) {
|
|
|
|
|
|
|
|
+ _load_docks();
|
|
|
|
+
|
|
if (defer_load_scene != "") {
|
|
if (defer_load_scene != "") {
|
|
|
|
|
|
load_scene(defer_load_scene);
|
|
load_scene(defer_load_scene);
|