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

FIRE-16485: Crash when calling texture refresh on an object that has a blacklisted copy

meow-7.2.2
Ansariel 2015-07-31 17:09:28 +02:00
parent 6f886b7b4e
commit 99f4be4bdf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/pipeline.cpp
View File

@ -3438,7 +3438,10 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f
mBuildQ2.push_back(drawablep);
drawablep->setState(LLDrawable::IN_REBUILD_Q2); // need flag here because it is just a list
}
if (flag & (LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION))
// <FS:Ansariel> FIRE-16485: Crash when calling texture refresh on an object that has a blacklisted copy
//if (flag & (LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION))
if ((flag & (LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION)) && drawablep->getVObj().notNull())
// </FS:Ansariel>
{
drawablep->getVObj()->setChanged(LLXform::SILHOUETTE);
}