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

Merge pull request #1379 from Azaezel/C4189

Browse source 
C4189 warning cleanups
This commit is contained in:
Areloch 2015-09-02 19:46:28 -05:00
commit b1d2ba8412
8 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/terrain/glsl/terrFeatureGLSL.cpp
View file

@ -820,12 +820,10 @@ void TerrainMacroMapFeatGLSL::processPix( Vector<ShaderComponent*> &componentL
meta->addStatement( new GenOp( " @ *= @.y * @.w;\r\n",
detailColor, detailInfo, inDet ) );
Var *baseColor = (Var*)LangElement::find( "baseColor" );
Var *outColor = (Var*)LangElement::find( "col" );
meta->addStatement( new GenOp( " @ = lerp( @, @ + @, @ );\r\n",
outColor, outColor, outColor, detailColor, detailBlend ) );
//outColor, outColor, baseColor, detailColor, detailBlend ) );
meta->addStatement( new GenOp( " }\r\n" ) );