diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-06-08 17:49:20 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-06-08 17:49:20 -0500 |
| commit | d8ffaf20bebd4342fee8eeb03b34087d41d1bd73 (patch) | |
| tree | f76d81a2994b9cef0977317bb5dc93107e439d75 /indra/llmath | |
| parent | 5f606069e29db5d9554ce6f4200d0d4c35ecc3a1 (diff) | |
| parent | 4ee387f971019fe4e2a5fce1578ba77387f1b7e1 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/v4color.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h index 175edf1471..f2863be531 100644 --- a/indra/llmath/v4color.h +++ b/indra/llmath/v4color.h @@ -88,7 +88,8 @@ class LLColor4 const LLColor4& set(const LLColor3 &vec); // Sets LLColor4 to LLColor3 vec (no change in alpha) const LLColor4& set(const LLColor3 &vec, F32 a); // Sets LLColor4 to LLColor3 vec, with alpha specified const LLColor4& set(const F32 *vec); // Sets LLColor4 to vec - const LLColor4& set(const LLColor4U& color4u); // Sets LLColor4 to color4u, rescaled. + const LLColor4& set(const F64 *vec); // Sets LLColor4 to (double)vec + const LLColor4& set(const LLColor4U& color4u); // Sets LLColor4 to color4u, rescaled. const LLColor4& setAlpha(F32 a); @@ -334,6 +335,15 @@ inline const LLColor4& LLColor4::set(const F32 *vec) return (*this); } +inline const LLColor4& LLColor4::set(const F64 *vec) +{ + mV[VX] = static_cast<F32>(vec[VX]); + mV[VY] = static_cast<F32>(vec[VY]); + mV[VZ] = static_cast<F32>(vec[VZ]); + mV[VW] = static_cast<F32>(vec[VW]); + return (*this); +} + // deprecated inline const LLColor4& LLColor4::setVec(F32 x, F32 y, F32 z) { |