Permalink
Browse files

Fix pickmasks.

  • Loading branch information...
Shyotl committed Jun 15, 2016
1 parent 5ccfc32 commit 027c3be69455883d728467221b03ed60d53a3e95
Showing with 6 additions and 1 deletion.
  1. +6 −1 indra/newview/llviewertexture.cpp
@@ -1002,13 +1002,15 @@ LLViewerFetchedTexture::LLViewerFetchedTexture(const LLUUID& id, FTType f_type,
LL_WARNS() << "Unsupported fetch type " << mFTType << LL_ENDL;
}
generateGLTexture();
+ mGLTexturep->setNeedsAlphaAndPickMask(TRUE);
}
LLViewerFetchedTexture::LLViewerFetchedTexture(const LLImageRaw* raw, FTType f_type, BOOL usemipmaps)
: LLViewerTexture(raw, usemipmaps)
{
init(TRUE) ;
mFTType = f_type;
+ mGLTexturep->setNeedsAlphaAndPickMask(TRUE);
}
LLViewerFetchedTexture::LLViewerFetchedTexture(const std::string& url, FTType f_type, const LLUUID& id, BOOL usemipmaps)
@@ -3409,7 +3411,9 @@ LLViewerMediaTexture::LLViewerMediaTexture(const LLUUID& id, BOOL usemipmaps, LL
mGLTexturep->setAllowCompression(false);
- mIsPlaying = FALSE ;
+ mGLTexturep->setNeedsAlphaAndPickMask(FALSE);
+
+ mIsPlaying = FALSE;
setMediaImpl() ;
@@ -3439,6 +3443,7 @@ void LLViewerMediaTexture::reinit(BOOL usemipmaps /* = TRUE */)
mUseMipMaps = usemipmaps ;
getLastReferencedTimer()->reset() ;
mGLTexturep->setUseMipMaps(mUseMipMaps) ;
+ mGLTexturep->setNeedsAlphaAndPickMask(FALSE);
}
void LLViewerMediaTexture::setUseMipMaps(BOOL mipmap)

0 comments on commit 027c3be

Please sign in to comment.