Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reimport file when .import changes #84974

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

KoBeWi
Copy link
Member

@KoBeWi KoBeWi commented Nov 16, 2023

Fixes #60730

Editor was already detecting that .import file has changed, but _test_for_reimport() which triggers the actual reimport did not check that.

Might need some testing.

@turbohz
Copy link

turbohz commented Nov 18, 2023

@KoBeWi , thanks for looking into this!

I was unaware of your attempt, and created #85067 (for 3.x).

The approaches are certainly different: here the fix is about the modification time of files.

Mine is more potentially disruptive (modifies the format of the .md5 files in the .import folder), but seems to work, too.

There's also the possibility that the fixes need to be different for each major version, due to different root causes.

@akien-mga
Copy link
Member

As we're reworking FS import stuff with #92303, might be worth including this too. I'd suggest waiting for #92303 to be merge, then rebase and make sure it works and we can include it too.

@akien-mga
Copy link
Member

As we're reworking FS import stuff with #92303, might be worth including this too. I'd suggest waiting for #92303 to be merge, then rebase and make sure it works and we can include it too.

Can be rebased and re-tested now.

@KoBeWi KoBeWi force-pushed the import_reimport branch from 2091280 to f13bb2f Compare June 29, 2024 18:06
@KoBeWi
Copy link
Member Author

KoBeWi commented Jun 29, 2024

Rebased and still works.

@akien-mga akien-mga merged commit 137b138 into godotengine:master Jul 8, 2024
18 checks passed
@akien-mga
Copy link
Member

Thanks!

@KoBeWi KoBeWi deleted the import_reimport branch July 8, 2024 18:26
akien-mga added a commit to akien-mga/godot that referenced this pull request Jul 24, 2024
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.
Borges-IST-2003 pushed a commit to Borges-IST-2003/godot that referenced this pull request Jul 24, 2024
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.
Luis-Wong pushed a commit to Luis-Wong/godot that referenced this pull request Jul 26, 2024
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.
RadiantUwU pushed a commit to RadiantUwU/godot that referenced this pull request Jul 27, 2024
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.
kii-chan-reloaded pushed a commit to kii-chan-reloaded/godot that referenced this pull request Aug 3, 2024
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.
2nafish117 pushed a commit to 2nafish117/godot that referenced this pull request Aug 5, 2024
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.
chryan pushed a commit to chryan/godot that referenced this pull request Aug 6, 2024
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.
maidopi-usagi pushed a commit to maidopi-usagi/godot that referenced this pull request Sep 11, 2024
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.
Akeal pushed a commit to Akeal/godot that referenced this pull request Oct 16, 2024
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Changing .import file externally doesn't trigger asset reimport
3 participants