diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-23 14:49:10 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-23 14:49:10 -0700 |
| commit | 71e986b0597341f9fcfb28f71bfbc46d65f08d88 (patch) | |
| tree | 68223bfe71c27f81b8ee172caf05af96f94e1829 /indra/llrender | |
| parent | 29216ac5e725254c48711737f5c22d2ad3e5e4a2 (diff) | |
NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llrender.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index aa94110f4d..0ac30b4d63 100755 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -832,8 +832,8 @@ LLLightState::LLLightState(S32 index) : mIndex(index), mEnabled(false), mConstantAtten(1.f), - mLinearAtten(1.f), - mQuadraticAtten(1.f), + mLinearAtten(0.f), + mQuadraticAtten(0.f), mSpotExponent(0.f), mSpotCutoff(180.f) { @@ -1150,7 +1150,7 @@ void LLRender::syncLightState() position[i] = light->mPosition; direction[i] = light->mSpotDirection; - attenuation[i].set(1.f/light->mLinearAtten, light->mQuadraticAtten, light->mSpecular.mV[3]); + attenuation[i].set(light->mLinearAtten, light->mQuadraticAtten, light->mSpecular.mV[3]); diffuse[i].set(light->mDiffuse.mV); } |