diff options
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/v3color.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h index 60353bea6e..0b3b4ea3e1 100644 --- a/indra/llmath/v3color.h +++ b/indra/llmath/v3color.h @@ -485,7 +485,7 @@ inline const LLColor3 srgbColor3(const LLColor3 &a) { return srgbColor; } -inline const LLColor3 linearColor3(const F32* v) { +inline const LLColor3 linearColor3p(const F32* v) { LLColor3 linearColor; linearColor.mV[0] = sRGBtoLinear(v[0]); linearColor.mV[1] = sRGBtoLinear(v[1]); @@ -496,12 +496,12 @@ inline const LLColor3 linearColor3(const F32* v) { template<class T> inline const LLColor3 linearColor3(const T& a) { - return linearColor3(a.mV); + return linearColor3p(a.mV); } template<class T> inline const LLVector3 linearColor3v(const T& a) { - return LLVector3(linearColor3(a.mV).mV); + return LLVector3(linearColor3p(a.mV).mV); } #endif |