Merge pull request #2236 from Azaezel/memberMess

cleans up all 'hides' warnings (at time of writing)
This commit is contained in:
Areloch 2018-05-30 20:36:43 -05:00 committed by GitHub
commit 36db8eacc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
233 changed files with 4370 additions and 4418 deletions

View file

@ -665,7 +665,7 @@ S32 TSShapeInstance::setDetailFromDistance( const SceneRenderState *state, F32 s
// We're inlining SceneRenderState::projectRadius here to
// skip the unnessasary divide by zero protection.
F32 pixelRadius = ( mShape->radius / scaledDistance ) * state->getWorldToScreenScale().y * pixelScale;
F32 pixelRadius = ( mShape->mRadius / scaledDistance ) * state->getWorldToScreenScale().y * pixelScale;
F32 pixelSize = pixelRadius * smDetailAdjust;
if ( pixelSize < smSmallestVisiblePixelSize ) {