diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-07 17:21:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-07 17:21:32 -0500 |
| commit | 592586052c9f0b4a189e5ebdeecb737ecd2eed9c (patch) | |
| tree | 5cac6cd846b20b7d0282277c2ae6ef01a2660f0b /indra/newview/llviewerpartsim.cpp | |
| parent | 2a59fef6beff7144085ea98ede4a3b4300248d7f (diff) | |
| parent | dbfcd6c9c5709b74365c2538ba312685b09d22bf (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
| -rw-r--r-- | 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 100644 --- 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; |