Ver Fonte

Merge pull request #347 from Azaezel/alpha40_fixTerrainCompilation

fix terrain compilation
Brian Roberts há 5 anos atrás
pai
commit
6f8ce90af3
2 ficheiros alterados com 2 adições e 1 exclusões
  1. 1 1
      Engine/source/terrain/terrData.cpp
  2. 1 0
      Engine/source/terrain/terrData.h

+ 1 - 1
Engine/source/terrain/terrData.cpp

@@ -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 - 0
Engine/source/terrain/terrData.h

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