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

Resolve issue with sculpties loading with incorrect discard levels.

Browse Source
This commit is contained in:
Shyotl
2012-10-22 15:26:53 -05:00
parent 02f214d8a7
commit 5c45979783
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewertexture.cpp
View File

@@ -1337,9 +1337,10 @@ void LLViewerFetchedTexture::setForSculpt()
static const S32 MAX_INTERVAL = 8 ; //frames
mForSculpt = TRUE ;
if(isForSculptOnly() && !getBoundRecently())
if(isForSculptOnly() && hasGLTexture() && !getBoundRecently())
{
destroyGLTexture() ; //sculpt image does not need gl texture.
mTextureState = ACTIVE;
}
checkCachedRawSculptImage() ;
setMaxVirtualSizeResetInterval(MAX_INTERVAL) ;

4
indra/newview/llvovolume.cpp
View File

@@ -617,7 +617,7 @@ void LLVOVolume::updateTextureVirtualSize(bool forced)
}
}
S32 texture_discard = mSculptTexture->getDiscardLevel(); //try to match the texture
S32 texture_discard = mSculptTexture->getCachedRawImageLevel(); //try to match the texture
S32 current_discard = getVolume() ? getVolume()->getSculptLevel() : -2 ;
if (texture_discard >= 0 && //texture has some data available
@@ -919,7 +919,7 @@ void LLVOVolume::sculpt()
S8 sculpt_components = 0;
const U8* sculpt_data = NULL;
S32 discard_level = mSculptTexture->getDiscardLevel();
S32 discard_level = mSculptTexture->getCachedRawImageLevel();
LLImageRaw* raw_image = mSculptTexture->getCachedRawImage() ;
S32 max_discard = mSculptTexture->getMaxDiscardLevel();