livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer

master
Ansariel 2023-12-09 15:00:12 +01:00
parent 4f974f4e91 4024a4df3b
commit f83afbc368
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llpanelface.cpp
View File

@ -1217,7 +1217,21 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
prev_obj_id = objectp->getID();
}
}
else
{
if (prev_obj_id != objectp->getID())
{
if (has_pbr_material && (mComboMatMedia->getCurrentIndex() == MATMEDIA_MATERIAL))
{
mComboMatMedia->selectNthItem(MATMEDIA_PBR);
}
else if (!has_pbr_material && (mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR))
{
mComboMatMedia->selectNthItem(MATMEDIA_MATERIAL);
}
prev_obj_id = objectp->getID();
}
}
mComboMatMedia->setEnabled(editable);
//LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");

3
indra/newview/llviewertexture.cpp
View File

@ -2213,9 +2213,6 @@ bool LLViewerFetchedTexture::updateFetch()
}
}
llassert(mRawImage.notNull() || !mIsRawImageValid);
llassert(mRawImage.notNull() || !mNeedsCreateTexture);
return mIsFetching ? true : false;
}

8
indra/newview/llviewertexturelist.cpp
View File

@ -907,6 +907,13 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
{
F32 vsize = face->getPixelArea();
// scale desired texture resolution higher or lower depending on texture scale
const LLTextureEntry* te = face->getTextureEntry();
F32 min_scale = te ? llmin(fabsf(te->getScaleS()), fabsf(te->getScaleT())) : 1.f;
min_scale = llmax(min_scale*min_scale, 0.1f);
vsize /= min_scale;
#if LL_DARWIN
vsize /= 1.f + LLViewerTexture::sDesiredDiscardBias*(1.f+face->getDrawable()->mDistanceWRTCamera*bias_distance_scale);
#else
@ -924,7 +931,6 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
// if a GLTF material is present, ignore that face
// as far as this texture stats go, but update the GLTF material
// stats
const LLTextureEntry* te = face->getTextureEntry();
LLFetchedGLTFMaterial* mat = te ? (LLFetchedGLTFMaterial*)te->getGLTFRenderMaterial() : nullptr;
llassert(mat == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(te->getGLTFRenderMaterial()) != nullptr);
if (mat)