Fix shader baker freezing if there are errors in the shader compilation process.#112803
Merged
Repiteo merged 1 commit intogodotengine:masterfrom Nov 19, 2025
Merged
Conversation
clayjohn
added
the
cherrypick:4.5
akien-mga
changed the title
DarioSamo
approved these changes
Nov 17, 2025
Contributor
DarioSamo
left a comment
DarioSamo
left a comment
There was a problem hiding this comment.
Fix makes sense to me. The alternative here would be to move the code to a separate function to preserve the "Godot" style of early return error handling, but I think this is perfectly fine.
Thanks for finding the issue!
…on process. `tasks_processed` was not incrementing previously, so the packing was never considered "done".
akien-mga
force-pushed
the
master.pr_bake_shaders_freeze_fix
branch
from
5e317ce to
b9d5c3e
Compare
akien-mga
approved these changes
Nov 19, 2025
Contributor
|
Thanks! |
|
Had the same problem on 4.5.1 #112560 forward+ |
Member
|
The original but was also present in 4.5 so that's probably the same issue, will be cherry picked to 4.5.x |
Member
|
Cherry-picked for 4.5.2. |
akien-mga
removed
the
cherrypick:4.5
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously, if there was an error compiling the shader, tasks_processed was incrementing, so the packing was never considered "done".
Fix #112794