zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-30 23:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed incorrect check for overrideshader.

Browse source
This commit is contained in:
Christoph Oelckers 2014-08-23 00:47:05 +02:00
parent 1050013017
commit bf6079af46
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl/textures/gl_material.cpp
View file

@ -614,7 +614,7 @@ outl:
void FMaterial::Bind(int clampmode, int translation, int overrideshader, bool alphatexture) void FMaterial::Bind(int clampmode, int translation, int overrideshader, bool alphatexture)
{ {
int usebright = false; int usebright = false;
int shaderindex = overrideshader > 0? overrideshader : mShaderIndex; int shaderindex = overrideshader >= 0? overrideshader : mShaderIndex;
int maxbound = 0; int maxbound = 0;
bool allowhires = tex->xScale == FRACUNIT && tex->yScale == FRACUNIT && clampmode <= CLAMP_XY && !mExpanded; bool allowhires = tex->xScale == FRACUNIT && tex->yScale == FRACUNIT && clampmode <= CLAMP_XY && !mExpanded;
@ -624,7 +624,7 @@ void FMaterial::Bind(int clampmode, int translation, int overrideshader, bool al
else if (tex->bWarped && clampmode <= CLAMP_XY) clampmode = CLAMP_NONE; else if (tex->bWarped && clampmode <= CLAMP_XY) clampmode = CLAMP_NONE;
const FHardwareTexture *gltexture = mBaseLayer->Bind(0, clampmode, translation, alphatexture, allowhires? tex:NULL); const FHardwareTexture *gltexture = mBaseLayer->Bind(0, clampmode, translation, alphatexture, allowhires? tex:NULL);
if (gltexture != NULL && shaderindex > 0 && overrideshader == 0) if (gltexture != NULL && shaderindex > 0 && overrideshader == -1)
{ {
for(unsigned i=0;i<mTextureLayers.Size();i++) for(unsigned i=0;i<mTextureLayers.Size();i++)
{ {