TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'GG-Github/development' into fix_opengl_new_terrain_blend

Browse source
This commit is contained in:
LuisAntonRebollo 2014-11-30 04:47:38 +01:00
commit ff83e8c209
1455 changed files with 98353 additions and 15020 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -148,6 +148,8 @@ protected:
U32 mCurrPass;
static const Vector<String> mSamplerNames;
GFXTexHandle mBaseMapTexture;
GFXTexHandle mLayerMapTexture;