Merge pull request #1984 from FooBarbarians/fix-1912

Reordering initialization methods #1912
This commit is contained in:
Areloch 2017-04-26 01:11:51 -05:00 committed by GitHub
commit 124ecb2fe0
70 changed files with 207 additions and 205 deletions

View file

@ -196,15 +196,15 @@ WaterObject::WaterObject()
mUndulateMaxDist(50.0f),
mMiscParamW( 0.0f ),
mUnderwaterPostFx( NULL ),
mBasicLighting( false ),
mOverallWaveMagnitude( 1.0f ),
mOverallRippleMagnitude( 0.1f ),
mCubemap( NULL ),
mSoundAmbience( NULL ),
mOverallWaveMagnitude( 1.0f ),
mBasicLighting( false ),
mSpecularPower( 48.0f ),
mSoundAmbience( NULL ),
mCubemap( NULL ),
mSpecularColor( 1.0f, 1.0f, 1.0f, 1.0f ),
mDepthGradientMax( 50.0f ),
mEmissive( false )
mEmissive( false ),
mDepthGradientMax( 50.0f )
{
mTypeMask = WaterObjectType;