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

SL-18697 Fix for particle textures not loading.

master
Dave Parks 2022-11-22 16:01:18 -06:00
parent 8bdd71c4e3
commit 8aa65f6797
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/lldrawpoolalpha.cpp
View File

@ -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)
{

2
indra/newview/llspatialpartition.h
View File

@ -106,7 +106,7 @@ public:
BOOL mFullbright;
U8 mBump;
U8 mShiny;
U8 mTextureTimer = 0;
U8 mTextureTimer = 1;
BOOL mParticle;
F32 mPartSize;
F32 mVSize;

3
indra/newview/llvopartgroup.cpp
View File

@ -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();