diff options
author | Callum Prentice <callum@lindenlab.com> | 2016-06-02 14:00:36 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2016-06-02 14:00:36 -0700 |
commit | a24e24fb50e2bbf0a73ccd53ff2ba64124dabeba (patch) | |
tree | 526dc07621a65fd46c635ed875145a30c9e21432 /indra/newview/llsurfacepatch.cpp | |
parent | 4796f717c2a2c5756b91fa5281019ff23a10a613 (diff) | |
parent | 336121312b9ea30fcc46a033f3b6c4b23358ab1b (diff) |
Merged in NickyD/viewer-release-vlc (pull request #2)
Linux media_plugin_libvlc
Diffstat (limited to 'indra/newview/llsurfacepatch.cpp')
-rw-r--r-- | indra/newview/llsurfacepatch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp index 2d06b8599c..d28a7cc048 100644 --- a/indra/newview/llsurfacepatch.cpp +++ b/indra/newview/llsurfacepatch.cpp @@ -230,8 +230,8 @@ void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3 const F32 xyScaleInv = (1.f / xyScale)*(0.2222222222f); F32 vec[3] = { - fmod((F32)(mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f), - fmod((F32)(mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f), + (F32)fmod((F32)(mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f), + (F32)fmod((F32)(mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f), 0.f }; F32 rand_val = llclamp(noise2(vec)* 0.75f + 0.5f, 0.f, 1.f); |