Merged Fix double vs float complaint from visual studio.

meow-7.2.2
Ansariel Hiller 2019-07-13 12:24:46 +00:00
commit e35efb2754
1 changed files with 2 additions and 2 deletions

View File

@ -1265,8 +1265,8 @@ LLColor4 LLSettingsSky::getTotalAmbient() const
LLColor3 LLSettingsSky::getMoonlightColor() const
{
F32 moon_brightness = getIsMoonUp() ? getMoonBrightness() : 0.001f;
LLColor3 moonlight_a(0.9, 0.9, 1.32);
LLColor3 moonlight_b(0.66, 0.66, 2.0);
LLColor3 moonlight_a(0.9f, 0.9f, 1.32f);
LLColor3 moonlight_b(0.66f, 0.66f, 2.0f);
LLColor3 moonlight = lerp(moonlight_b, moonlight_a, moon_brightness);
return moonlight;
}