clang reports: unclear || + && and &+| mixes.

This commit is contained in:
Azaezel 2016-10-14 17:26:13 -05:00
parent 1131ed15df
commit c57b1a8b70
16 changed files with 30 additions and 28 deletions

View file

@ -612,9 +612,9 @@ void ProcessedPrePassMaterial::_determineFeatures( U32 stageNum,
mIsLightmappedGeometry = ( fd.features.hasFeature( MFT_ToneMap ) ||
fd.features.hasFeature( MFT_LightMap ) ||
fd.features.hasFeature( MFT_VertLit ) ||
( bEnableMRTLightmap && fd.features.hasFeature( MFT_IsTranslucent ) ||
( bEnableMRTLightmap && (fd.features.hasFeature( MFT_IsTranslucent ) ||
fd.features.hasFeature( MFT_ForwardShading ) ||
fd.features.hasFeature( MFT_IsTranslucentZWrite ) ) );
fd.features.hasFeature( MFT_IsTranslucentZWrite) ) ) );
// Integrate proper opaque stencil write state
mUserDefined.addDesc( mPrePassMgr->getOpaqueStenciWriteDesc( mIsLightmappedGeometry ) );