diff options
author | simon <none@none> | 2013-05-09 15:30:49 -0700 |
---|---|---|
committer | simon <none@none> | 2013-05-09 15:30:49 -0700 |
commit | 5687b0c4df5c28cb6aa6cb33cf0d2c4bbe1b912e (patch) | |
tree | 8d1f9f3044adeb81778769fef0f57349fb5ca72f /indra/newview/llviewerpartsim.cpp | |
parent | ee2fce8790b69d61845cc32fbf7cdce8a33b0dab (diff) | |
parent | 50bbb0b7ed542a5f9dee4f347531537beecddd26 (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
-rwxr-xr-x | indra/newview/llviewerpartsim.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 21f1d2619c..96cd43a8ab 100755 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -387,7 +387,7 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt) } // Do glow interpolation - part->mGlow.mV[3] = (U8) (lerp(part->mStartGlow, part->mEndGlow, frac)*255.f); + part->mGlow.mV[3] = (U8) llround(lerp(part->mStartGlow, part->mEndGlow, frac)*255.f); // Set the last update time to now. part->mLastUpdateTime = cur_time; |