TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* BugFix: Clear some MSVC compiler warnings.

Browse source
This commit is contained in:
Robert MacGregor 2021-10-07 00:27:39 -04:00
parent 026409ed7f
commit 5d26dba7da
23 changed files with 24 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/terrain/terrCellMaterial.cpp
View file

@ -615,8 +615,6 @@ bool TerrainCellMaterial::_initShader(bool deferredMat,
mOrmTexArrayConst = mShader->getShaderConstHandle("$ormMapSampler");
if (mOrmTexArrayConst->isValid())
{
GFXTextureProfile* profile = &GFXStaticTextureProfile;
const S32 sampler = mOrmTexArrayConst->getSamplerRegister();
desc.samplers[sampler] = GFXSamplerStateDesc::getWrapLinear();

3
Engine/source/terrain/terrData.cpp
View file

@ -992,8 +992,6 @@ void TerrainBlock::addMaterial( const String &name, U32 insertAt )
mFile->mMaterials.push_back( mat );
mFile->_initMaterialInstMapping();
bool isSrv = isServerObject();
//now we update our asset
if (mTerrainAsset)
{
@ -1418,7 +1416,6 @@ void TerrainBlock::unpackUpdate(NetConnection* con, BitStream *stream)
char buffer[256];
stream->readString(buffer);
bool validAsset = setTerrainAsset(StringTable->insert(buffer));
}
if (baseTexSizeChanged && isProperlyAdded())
_updateBaseTexture(NONE);