Skip to content

Conversation

illwieckz
Copy link
Member

Do not load heatHaze map when heatHaze is disabled.

This doesn't fix the root cause of #1736, but it workarounds it when heatHaze is disabled:

This is wanted in all cases because it's good to skip loading an uploading stuff we don't use anyway.

@slipher
Copy link
Member

slipher commented Aug 9, 2025

This spams parse errors and fails to really disable the stage:

unvanquished_2025-08-08_225817_000

Setting stage->active = false probably doesn't work there since it gets set to true 2 more times later - inside ParseStage, and after it returns as well. I ran into that while writing #1721 (which removes the redundant 2nd time setting it to true).

@illwieckz
Copy link
Member Author

illwieckz commented Aug 9, 2025

Hmm, right. I now disable the stage at the very end of the parsing (just before loading the image).

@slipher
Copy link
Member

slipher commented Aug 10, 2025

stage->active = false still doesn't work there since it is set again after ParseStage, as described in my previous comment. This results in messages such as Warn: Shader textures/plat23_custom/forcefield has a heatHazeMap stage with no image (ignored). But I think it would work if combined with my change from #1721 that deletes the final stage-active = true.

@illwieckz
Copy link
Member Author

stage->active = false still doesn't work there since it is set again after ParseStage

Well, that is a bug unrelated to this.

@illwieckz
Copy link
Member Author

I added a patch to not re-enable stages after parsing.

@slipher
Copy link
Member

slipher commented Aug 12, 2025

LGTM

@illwieckz
Copy link
Member Author

LGTM

Thanks.

@illwieckz illwieckz merged commit c0e3904 into master Aug 14, 2025
9 checks passed
@illwieckz illwieckz deleted the illwieckz/no-heathaze branch August 14, 2025 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Renderer T-Improvement Improvement for an existing feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants