Skip to content
Snippets Groups Projects
Commit 72ed28ef authored by Anchor's avatar Anchor
Browse files

[SL-11548] - don't treat the local avatar bakes as alpha masks

parent 2fb89700
No related branches found
No related tags found
No related merge requests found
...@@ -58,6 +58,8 @@ LLViewerTexLayerSetBuffer::LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner, ...@@ -58,6 +58,8 @@ LLViewerTexLayerSetBuffer::LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner,
mNeedsUpdate(TRUE), mNeedsUpdate(TRUE),
mNumLowresUpdates(0) mNumLowresUpdates(0)
{ {
mGLTexturep->setNeedsAlphaAndPickMask(FALSE);
LLViewerTexLayerSetBuffer::sGLByteCount += getSize(); LLViewerTexLayerSetBuffer::sGLByteCount += getSize();
mNeedsUpdateTimer.start(); mNeedsUpdateTimer.start();
} }
......
...@@ -337,14 +337,14 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight) ...@@ -337,14 +337,14 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
setStarBrightness((1 - weight) * (F32) src.getStarBrightness() setStarBrightness((1 - weight) * (F32) src.getStarBrightness()
+ weight * (F32) dest.getStarBrightness()); + weight * (F32) dest.getStarBrightness());
llassert(src.getSunAngle() >= - F_PI && //llassert(src.getSunAngle() >= - F_PI &&
src.getSunAngle() <= 3 * F_PI); // src.getSunAngle() <= 3 * F_PI);
llassert(dest.getSunAngle() >= - F_PI && //llassert(dest.getSunAngle() >= - F_PI &&
dest.getSunAngle() <= 3 * F_PI); // dest.getSunAngle() <= 3 * F_PI);
llassert(src.getEastAngle() >= 0 && //llassert(src.getEastAngle() >= 0 &&
src.getEastAngle() <= 4 * F_PI); // src.getEastAngle() <= 4 * F_PI);
llassert(dest.getEastAngle() >= 0 && //llassert(dest.getEastAngle() >= 0 &&
dest.getEastAngle() <= 4 * F_PI); // dest.getEastAngle() <= 4 * F_PI);
// sun angle and east angle require some handling to make sure // sun angle and east angle require some handling to make sure
// they go in circles. Yes quaternions would work better. // they go in circles. Yes quaternions would work better.
......
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