diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-22 16:01:18 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-22 16:01:18 -0600 |
| commit | 8aa65f67975fc362d1fcf1d085d646f5fa68798d (patch) | |
| tree | 85be4faca3b32c0bdad31a2a4567e6c6756c1127 /indra/newview | |
| parent | 8bdd71c4e3515d5b63301ab824821879ffb50746 (diff) | |
SL-18697 Fix for particle textures not loading.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llspatialpartition.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvopartgroup.cpp | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 437a0c2ea1..759aa078ff 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -767,10 +767,10 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) } } - if (params.mGroup) - { - params.mGroup->rebuildMesh(); - } + //if (params.mGroup) // TOO LATE + //{ + // params.mGroup->rebuildMesh(); + //} if (params.mAvatar != nullptr) { diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 692aae6fa4..42ae1a2a15 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -106,7 +106,7 @@ public: BOOL mFullbright; U8 mBump; U8 mShiny; - U8 mTextureTimer = 0; + U8 mTextureTimer = 1; BOOL mParticle; F32 mPartSize; F32 mVSize; diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index 08f10a2028..0c09cbf2c2 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -916,7 +916,7 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group) BOOL fullbright = facep->isState(LLFace::FULLBRIGHT); F32 vsize = facep->getVirtualSize(); - + bool batched = false; U32 bf_src = LLRender::BF_SOURCE_ALPHA; @@ -961,7 +961,6 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group) U32 offset = facep->getIndicesStart(); U32 count = facep->getIndicesCount(); LLDrawInfo* info = new LLDrawInfo(start,end,count,offset,facep->getTexture(), - //facep->getTexture(), buffer, object->isSelected(), fullbright); const LLVector4a* exts = group->getObjectExtents(); |