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

Change texture default to non-auto-alphamaskable, non-pickable. Only 'fetchable' textures may qualify for either.

Browse Source
This commit is contained in:
Shyotl
2014-06-22 03:53:08 -05:00
parent 5cb5d284c3
commit 96df7b82de
4 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llrender/llimagegl.h
View File

@@ -135,7 +135,7 @@ public:
BOOL getHasGLTexture() const { return mTexName != 0; }
LLGLuint getTexName() const { return mTexName; }
BOOL getIsAlphaMask(const F32 max_rmse) const { return mCanMask && (max_rmse < 0.f ? (bool)mIsMask : (mMaskRMSE <= max_rmse)); }
BOOL getIsAlphaMask(const F32 max_rmse) const { return mNeedsAlphaAndPickMask && (max_rmse < 0.f ? (bool)mIsMask : (mMaskRMSE <= max_rmse)); }
BOOL getIsResident(BOOL test_now = FALSE); // not const
@@ -185,7 +185,6 @@ private:
S8 mHasExplicitFormat; // If false (default), GL format is f(mComponents)
S8 mAutoGenMips;
BOOL mCanMask;
BOOL mIsMask;
F32 mMaskRMSE;
BOOL mNeedsAlphaAndPickMask;