TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #347 from Azaezel/alpha40_fixTerrainCompilation

Browse source 
fix terrain compilation
This commit is contained in:
Brian Roberts 2020-10-03 13:32:45 -05:00 • committed by GitHub
commit 6f8ce90af3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -305,7 +305,7 @@ bool TerrainBlock::_setBaseTexFormat(void *obj, const char *index, const char *d
// If the cached base texture is older that the terrain file or
// it doesn't exist then generate and cache it.
String baseCachePath = terrain->_getBaseTexCacheFileName();
if (Platform::compareModifiedTimes(baseCachePath, terrain->mTerrainAsset->getTerrainFilePath()) < 0 && mUpdateBasetex)
if (Platform::compareModifiedTimes(baseCachePath, terrain->mTerrainAsset->getTerrainFilePath()) < 0 && terrain->mUpdateBasetex)
terrain->_updateBaseTexture(true);
break;
}

1
Engine/source/terrain/terrData.h
View file

@ -478,6 +478,7 @@ public:
virtual void getUtilizedAssets(Vector<StringTableEntry>* usedAssetsList);
protected:
bool mUpdateBasetex;
bool mIgnoreZodiacs;
U16* zode_primBuffer;
void deleteZodiacPrimitiveBuffer();