Skip to content
Snippets Groups Projects
Commit f2867c71 authored by Brad Kittenbrink's avatar Brad Kittenbrink
Browse files

Better fix for DRTVWR-559 mac build breakage

parent 5c83ac76
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -33,6 +33,7 @@ class LLVector4; ...@@ -33,6 +33,7 @@ class LLVector4;
#include "llerror.h" #include "llerror.h"
#include "llmath.h" #include "llmath.h"
#include "llsd.h" #include "llsd.h"
#include "v3math.h" // needed for linearColor3v implemtation below
#include <string.h> #include <string.h>
// LLColor3 = |r g b| // LLColor3 = |r g b|
...@@ -498,4 +499,9 @@ inline const LLColor3 linearColor3(const T& a) { ...@@ -498,4 +499,9 @@ inline const LLColor3 linearColor3(const T& a) {
return linearColor3(a.mV); return linearColor3(a.mV);
} }
template<class T>
inline const LLVector3 linearColor3v(const T& a) {
return LLVector3(linearColor3(a.mV).mV);
}
#endif #endif
...@@ -609,9 +609,4 @@ inline std::ostream& operator<<(std::ostream& s, const LLVector3 &a) ...@@ -609,9 +609,4 @@ inline std::ostream& operator<<(std::ostream& s, const LLVector3 &a)
return s; return s;
} }
template<class T>
inline const LLVector3 linearColor3v(const T& a) {
return LLVector3(linearColor3(a.mV).mV);
}
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment