zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 07:12:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix diffuse-only material shaders not applying.

Browse source
This commit is contained in:
Marisa the Magician 2023-01-12 14:03:19 +01:00 committed by Christoph Oelckers
parent f9de0d5c11
commit 81e7d77b44
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/textures/hw_material.cpp
View file

@ -133,13 +133,16 @@ FMaterial::FMaterial(FGameTexture * tx, int scaleflags)
if (index >= FIRST_USER_SHADER) if (index >= FIRST_USER_SHADER)
{ {
const UserShaderDesc& usershader = usershaders[index - FIRST_USER_SHADER]; const UserShaderDesc& usershader = usershaders[index - FIRST_USER_SHADER];
if (tx->Layers && usershader.shaderType == mShaderIndex) // Only apply user shader if it matches the expected material if (usershader.shaderType == mShaderIndex) // Only apply user shader if it matches the expected material
{
if (tx->Layers)
{ {
for (auto& texture : tx->Layers->CustomShaderTextures) for (auto& texture : tx->Layers->CustomShaderTextures)
{ {
if (texture == nullptr) continue; if (texture == nullptr) continue;
mTextureLayers.Push({ texture.get(), 0 }); // scalability should be user-definable. mTextureLayers.Push({ texture.get(), 0 }); // scalability should be user-definable.
} }
}
mShaderIndex = index; mShaderIndex = index;
} }
} }