Fix tex unit assignment to std::optional
type
#1695
Merged
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.
Fixes a small bug in the storage of the texture to tex unit bindings in the shader program.
openage/libopenage/renderer/opengl/shader_program.cpp
Lines 427 to 429 in 02d3242
The current code (see above) assumes that there always exists a binding from tex unit to texture and the
std::optional
type always contains a value. However, this is not always the case, e.g. when the shader is first initialized and no textures have been bound yet. We also wouldn't need to usestd::optional
then, don't we?