Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pickmasks.

Browse Source
This commit is contained in:
Shyotl
2016-06-15 02:19:08 -05:00
parent 5ccfc3257b
commit 027c3be694
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewertexture.cpp
View File

@@ -1002,6 +1002,7 @@ LLViewerFetchedTexture::LLViewerFetchedTexture(const LLUUID& id, FTType f_type,
LL_WARNS() << "Unsupported fetch type " << mFTType << LL_ENDL; LL_WARNS() << "Unsupported fetch type " << mFTType << LL_ENDL;
} }
generateGLTexture(); generateGLTexture();
mGLTexturep->setNeedsAlphaAndPickMask(TRUE);
} }
LLViewerFetchedTexture::LLViewerFetchedTexture(const LLImageRaw* raw, FTType f_type, BOOL usemipmaps) LLViewerFetchedTexture::LLViewerFetchedTexture(const LLImageRaw* raw, FTType f_type, BOOL usemipmaps)
@@ -1009,6 +1010,7 @@ LLViewerFetchedTexture::LLViewerFetchedTexture(const LLImageRaw* raw, FTType f_t
{ {
init(TRUE) ; init(TRUE) ;
mFTType = f_type; mFTType = f_type;
mGLTexturep->setNeedsAlphaAndPickMask(TRUE);
} }
LLViewerFetchedTexture::LLViewerFetchedTexture(const std::string& url, FTType f_type, const LLUUID& id, BOOL usemipmaps) 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); mGLTexturep->setAllowCompression(false);
mIsPlaying = FALSE ; mGLTexturep->setNeedsAlphaAndPickMask(FALSE);
mIsPlaying = FALSE;
setMediaImpl() ; setMediaImpl() ;
@@ -3439,6 +3443,7 @@ void LLViewerMediaTexture::reinit(BOOL usemipmaps /* = TRUE */)
mUseMipMaps = usemipmaps ; mUseMipMaps = usemipmaps ;
getLastReferencedTimer()->reset() ; getLastReferencedTimer()->reset() ;
mGLTexturep->setUseMipMaps(mUseMipMaps) ; mGLTexturep->setUseMipMaps(mUseMipMaps) ;
mGLTexturep->setNeedsAlphaAndPickMask(FALSE);
} }
void LLViewerMediaTexture::setUseMipMaps(BOOL mipmap) void LLViewerMediaTexture::setUseMipMaps(BOOL mipmap)