- fixed some uninitialized variables in the texture data.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@548 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2009-10-15 22:58:36 +00:00
parent c18adf80b9
commit 8bc4df43d0
3 changed files with 17 additions and 1 deletions

View file

@ -56,6 +56,21 @@ public:
hShader = hVertProg = hFragProg = NULL;
currentfogenabled = currenttexturemode = 0;
currentlightfactor = currentlightdist = 0.0f;
currentfogdensity = -1;
currentfogcolor = 0;
timer_index = -1;
desaturation_index = -1;
fogenabled_index = -1;
texturemode_index = -1;
camerapos_index = -1;
lightparms_index = -1;
colormapstart_index = -1;
colormaprange_index = -1;
lightrange_index = -1;
fogcolor_index = -1;
lights_index = -1;
}
~FShader();

View file

@ -538,6 +538,7 @@ FMaterial::FMaterial(FTexture * tx, bool forceexpand)
tx->UseType == FTexture::TEX_Decal ||
forceexpand;
mShaderIndex = 0;
// TODO: apply custom shader object here
/* if (tx->CustomShaderDefinition)
{
@ -569,7 +570,6 @@ FMaterial::FMaterial(FTexture * tx, bool forceexpand)
}
}
}
else mShaderIndex = 0;
if (!expanded)
{

View file

@ -231,6 +231,7 @@ FTexture::MiscGLInfo::MiscGLInfo() throw()
areacount = 0;
mIsTransparent = -1;
shaderspeed = 1.f;
shaderindex = 0;
Material = NULL;
SystemTexture = NULL;