Skip to content

Commit

Permalink
Android Editor: Disable file reimport when .import changes
Browse files Browse the repository at this point in the history
This is disabling the logic added in godotengine#84974 which caused godotengine#94416.
That issue still needs to be debugged further, but this works around
the regression and should have minimal usability impact on Android.
  • Loading branch information
akien-mga authored and kii-chan-reloaded committed Aug 3, 2024
1 parent 53d2d4e commit 7637d98
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions editor/editor_file_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7637d98

Please sign in to comment.