Merge branch 'terrainNormalNeener' into PBR_PR

This commit is contained in:
Azaezel 2018-11-01 14:06:00 -05:00
commit b3805fe778
2 changed files with 6 additions and 0 deletions

View file

@ -960,6 +960,9 @@ void TerrainNormalMapFeatGLSL::processVert( Vector<ShaderComponent*> &component
void TerrainNormalMapFeatGLSL::processPix( Vector<ShaderComponent*> &componentList,
const MaterialFeatureData &fd )
{
// We only need to process normals during the deferred.
if (!fd.features.hasFeature(MFT_DeferredConditioner))
return;
MultiLine *meta = new MultiLine;

View file

@ -956,6 +956,9 @@ void TerrainNormalMapFeatHLSL::processVert( Vector<ShaderComponent*> &component
void TerrainNormalMapFeatHLSL::processPix( Vector<ShaderComponent*> &componentList,
const MaterialFeatureData &fd )
{
// We only need to process normals during the deferred.
if (!fd.features.hasFeature(MFT_DeferredConditioner))
return;
MultiLine *meta = new MultiLine;