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.

Sign up for GitHub

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

Jump to bottom

Fix translation remapping check for imported resources #84791

Merged
merged 1 commit into from
Nov 12, 2023
Merged

Fix translation remapping check for imported resources #84791

merged 1 commit into from
Nov 12, 2023

Conversation

akien-mga
Copy link
Member

The logic didn't take .import files into account, so it would fail when exporting projects, as the remapping couldn't be done.

The exported MRP looks like this:

.
./icon.svg
./project.binary
./cassette_player_text_en.png.import
./cassette_player_text_ja_JP.png.import
./icon.svg.import
./test.tscn.remap
./test.gd
./.godot
./.godot/imported
./.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex
./.godot/imported/cassette_player_text_en.png-5d88eeeff54919eb8d8309119eae0520.ctex
./.godot/imported/cassette_player_text_ja_JP.png-c206992b4242e4e4b53fb44b3b4a5a95.ctex
./.godot/uid_cache.bin
./.godot/exported
./.godot/exported/133200997
./.godot/exported/133200997/export-f0a4ea32b72b64218d23e48a955cbc61-test.scn
./.godot/global_script_class_cache.cfg

I'm not sure if the check for the path without .import should be kept, I assumed this code might be used for both imported and non imported remapped files.

Fixes #81660.

@akien-mga akien-mga added bug topic:core cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Nov 12, 2023
@akien-mga akien-mga added this to the 4.2 milestone Nov 12, 2023
@akien-mga akien-mga requested a review from a team as a code owner November 12, 2023 12:19
YuriSizov
YuriSizov approved these changes Nov 12, 2023
View reviewed changes
Copy link
Contributor

@YuriSizov YuriSizov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, I think

adamscott
adamscott approved these changes Nov 12, 2023
View reviewed changes
Copy link
Member

@adamscott adamscott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it fixes the issue, it's all right. Seems fine.

@akien-mga akien-mga merged commit 2bcc2a3 into godotengine:master Nov 12, 2023
15 checks passed
@akien-mga akien-mga deleted the fix-translation-remapping-check branch November 12, 2023 22:16
@akien-mga akien-mga mentioned this pull request Dec 5, 2023
Closed
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jan 23, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adamscott adamscott adamscott approved these changes

@YuriSizov YuriSizov YuriSizov approved these changes

Assignees
No one assigned
Labels
bug topic:core
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

Texture remaps don't work in exported project
3 participants
@akien-mga @YuriSizov @adamscott