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

Merge branch 'master' into console-func-refactor

Browse source 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
This commit is contained in:
Daniel Buckmaster 2014-10-14 14:40:17 +11:00
commit b507dc9555
6487 changed files with 315149 additions and 609761 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/environment/waterObject.h
View file

@ -97,6 +97,7 @@ struct WaterMatParams
MaterialParameterHandle* mSpecularParamsSC;
MaterialParameterHandle* mDepthGradMaxSC;
MaterialParameterHandle* mReflectivitySC;
MaterialParameterHandle* mDepthGradSamplerSC;
void clear();
void init(BaseMatInstance* matInst);