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

@ -1041,9 +1041,9 @@ void GFXDrawUtil::_drawSolidPolyhedron( const GFXStateBlockDesc &desc, const Any
continue;
}
U32 numPoints = poly.extractFace( i, &indices[ idx ], numIndices - idx );
numIndicesForPoly[ numPolys ] = numPoints;
idx += numPoints;
U32 polyIDx = poly.extractFace( i, &indices[ idx ], numIndices - idx );
numIndicesForPoly[ numPolys ] = polyIDx;
idx += polyIDx;
numPolys ++;
}
@ -1083,11 +1083,11 @@ void GFXDrawUtil::drawObjectBox( const GFXStateBlockDesc &desc, const Point3F &s
PrimBuild::color( color );
PrimBuild::begin( GFXLineList, 48 );
static const Point3F cubePoints[8] =
Point3F cubePts[8];
for (U32 i = 0; i < 8; i++)
{
Point3F(-0.5, -0.5, -0.5), Point3F(-0.5, -0.5, 0.5), Point3F(-0.5, 0.5, -0.5), Point3F(-0.5, 0.5, 0.5),
Point3F( 0.5, -0.5, -0.5), Point3F( 0.5, -0.5, 0.5), Point3F( 0.5, 0.5, -0.5), Point3F( 0.5, 0.5, 0.5)
};
cubePts[i] = cubePoints[i]/2;
}
// 8 corner points of the box
for ( U32 i = 0; i < 8; i++ )