Sync llcommon with Alchemy a bit.
llmath::llround->ll_round LL_ICC->LL_INTELC Add llpredicate Add LL_CPP11 macro Remove llhash Update llinitparam, llsd and all relatives of it.
This commit is contained in:
@@ -125,10 +125,10 @@ LLColor4 LLColor4::cyan6(0.2f, 0.6f, 0.6f, 1.0f);
|
||||
LLColor4::operator const LLColor4U() const
|
||||
{
|
||||
return LLColor4U(
|
||||
(U8)llclampb(llmath::llround(mV[VRED]*255.f)),
|
||||
(U8)llclampb(llmath::llround(mV[VGREEN]*255.f)),
|
||||
(U8)llclampb(llmath::llround(mV[VBLUE]*255.f)),
|
||||
(U8)llclampb(llmath::llround(mV[VALPHA]*255.f)));
|
||||
(U8)llclampb(ll_round(mV[VRED]*255.f)),
|
||||
(U8)llclampb(ll_round(mV[VGREEN]*255.f)),
|
||||
(U8)llclampb(ll_round(mV[VBLUE]*255.f)),
|
||||
(U8)llclampb(ll_round(mV[VALPHA]*255.f)));
|
||||
}
|
||||
|
||||
LLColor4::LLColor4(const LLColor3 &vec, F32 a)
|
||||
|
||||
Reference in New Issue
Block a user