Move initialization check for CanvasMaterial#113650
Merged
akien-mga merged 1 commit intogodotengine:masterfrom Dec 9, 2025
Merged
Move initialization check for CanvasMaterial#113650akien-mga merged 1 commit intogodotengine:masterfrom
akien-mga merged 1 commit intogodotengine:masterfrom
Conversation
clayjohn
approved these changes
Dec 5, 2025
Member
clayjohn
left a comment
clayjohn
left a comment
There was a problem hiding this comment.
Makes sense.
This is only needed by CanvasItemMaterials because they queue up their shader updates using Material::_mark_initialized()
clayjohn
added
bug
topic:editor
regression
topic:shaders
cherrypick:4.5
Contributor
clayjohn
added
the
cherrypick:4.4
Member
Prevents the check from causing other materials to error
Member
|
Squashed the commits so it's ready to merge. |
AThousandShips
approved these changes
Dec 8, 2025
Member
|
Thanks! |
akien-mga
removed
the
cherrypick:4.4
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
5 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.
Materials all had a mandatory initialization check despite CanvasMaterials being the only ones that required initialization. This led to issues with material conversion, this PR moves the initialization check so that it only checks CanvasMaterials
SkyMaterials toShaderMaterial#112331Supersedes #112458
CC @ColinSORourke