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

A few nullchecks in the particle system. Had a null drawable pop up.

Browse Source
This commit is contained in:
Shyotl
2012-10-24 03:20:32 -05:00
parent b57f7cdc79
commit 94f61ce307
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerpartsim.cpp
View File

@@ -729,7 +729,7 @@ void LLViewerPartSim::updateSimulation()
LLViewerObject* vobj = mViewerPartGroups[i]->mVOPartGroupp; LLViewerObject* vobj = mViewerPartGroups[i]->mVOPartGroupp;
S32 visirate = 1; S32 visirate = 1;
if (vobj) if (vobj && vobj->mDrawable.notNull())
{ {
LLSpatialGroup* group = vobj->mDrawable->getSpatialGroup(); LLSpatialGroup* group = vobj->mDrawable->getSpatialGroup();
if (group && !group->isVisible()) // && !group->isState(LLSpatialGroup::OBJECT_DIRTY)) if (group && !group->isVisible()) // && !group->isState(LLSpatialGroup::OBJECT_DIRTY))
@@ -740,7 +740,7 @@ void LLViewerPartSim::updateSimulation()
if ((LLDrawable::getCurrentFrame()+mViewerPartGroups[i]->mID)%visirate == 0) if ((LLDrawable::getCurrentFrame()+mViewerPartGroups[i]->mID)%visirate == 0)
{ {
if (vobj) if (vobj && vobj->mDrawable.notNull())
{ {
gPipeline.markRebuild(vobj->mDrawable, LLDrawable::REBUILD_ALL, TRUE); gPipeline.markRebuild(vobj->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
} }