diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/llmath/v4color.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/llmath/v4color.cpp')
| -rw-r--r-- | indra/llmath/v4color.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llmath/v4color.cpp b/indra/llmath/v4color.cpp index 4ce8e10527..21166472e4 100644 --- a/indra/llmath/v4color.cpp +++ b/indra/llmath/v4color.cpp @@ -36,7 +36,7 @@ #include "v4color.h" #include "v4coloru.h" #include "v3color.h" -//#include "vmath.h" +#include "v4math.h" #include "llmath.h" // LLColor4 @@ -153,6 +153,14 @@ LLColor4::LLColor4(const LLColor4U& color4u) mV[VW] = color4u.mV[VW] * SCALE; } +LLColor4::LLColor4(const LLVector4& vector4) +{ + mV[VX] = vector4.mV[VX]; + mV[VY] = vector4.mV[VY]; + mV[VZ] = vector4.mV[VZ]; + mV[VW] = vector4.mV[VW]; +} + const LLColor4& LLColor4::setVec(const LLColor4U& color4u) { const F32 SCALE = 1.f/255.f; |