summaryrefslogtreecommitdiffstats
path: root/editor/editor_file_system.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-07-24 12:07:59 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-07-24 12:07:59 +0200
commit7acb61d346d6ee14a58517dba8515f7c0e896b9e (patch)
treeb71edd8e5f8be14a843293fcb8581e9a6b6f77bd /editor/editor_file_system.cpp
parent77e18da5ff4d619bd0df8ffac042f05ee3a8b882 (diff)
downloadredot-engine-7acb61d346d6ee14a58517dba8515f7c0e896b9e.tar.gz
Android Editor: Disable file reimport when .import changes
This is disabling the logic added in #84974 which caused #94416. That issue still needs to be debugged further, but this works around the regression and should have minimal usability impact on Android.
Diffstat (limited to 'editor/editor_file_system.cpp')
-rw-r--r--editor/editor_file_system.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index 0b2cf1424b..412d60f931 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -722,12 +722,16 @@ bool EditorFileSystem::_update_scan_actions() {
String full_path = ia.dir->get_file_path(idx);
bool need_reimport = _test_for_reimport(full_path, false);
+ // Workaround GH-94416 for the Android editor for now.
+ // `import_mt` seems to always be 0 and force a reimport on any fs scan.
+#ifndef ANDROID_ENABLED
if (!need_reimport && FileAccess::exists(full_path + ".import")) {
uint64_t import_mt = ia.dir->get_file_import_modified_time(idx);
if (import_mt != FileAccess::get_modified_time(full_path + ".import")) {
need_reimport = true;
}
}
+#endif
if (need_reimport) {
//must reimport