Fix regression where a tile's custom material was ignored #88190
Conversation
This file contains 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
Regression stemmed from commit 48bed50 The material assigned to a tile is completely ignored in master unless this line is changed.
Eoin-ONeill-Yokai
changed the title
clayjohn
approved these changes
Feb 11, 2024
|
Could probably still use a review from @groud But seems pretty safe to me |
AThousandShips
changed the title
KoBeWi
reviewed
Feb 11, 2024
| @@ -328,7 +328,7 @@ void TileMapLayer::_rendering_update() { | |||
| rs->canvas_item_set_material(ci, mat->get_rid()); | |||
| } | |||
| rs->canvas_item_set_parent(ci, get_canvas_item()); | |||
| rs->canvas_item_set_use_parent_material(ci, true); | |||
| rs->canvas_item_set_use_parent_material(ci, !mat.is_valid()); | |||
There was a problem hiding this comment.
Suggested change
| rs->canvas_item_set_use_parent_material(ci, !mat.is_valid()); | |
| rs->canvas_item_set_use_parent_material(ci, mat.is_null()); |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Regression found via bisect; originates from commit 48bed50
Any material assigned to a tile via the TileSetEditor was ignored due to always using the parent material, even when a material is assigned to a tile.
I presume that the change I've made is close to the desired / expected behavior where a TileMap layer will only use a parent material if the material assigned is invalid. @groud Let me know if this is right.
Testing