diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-11-29 11:31:08 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-11-29 11:31:08 -0800 |
| commit | a12e282cd473d5b7fc3e23fdd8fdfed11cc88864 (patch) | |
| tree | cf07df2ae2219009bdc8337f4f9b4f1247fbd65d /indra/newview/pipeline.cpp | |
| parent | 28f3b032076929bf595c34ab10666930c7ea1464 (diff) | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
merge changes for 5.0.9-release
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 19487c3230..d3be5fea1a 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3903,7 +3903,14 @@ void LLPipeline::postSort(LLCamera& camera) } //flush particle VB - LLVOPartGroup::sVB->flush(); + if (LLVOPartGroup::sVB) + { + LLVOPartGroup::sVB->flush(); + } + else + { + LL_WARNS_ONCE() << "Missing particle buffer" << LL_ENDL; + } /*bool use_transform_feedback = gTransformPositionProgram.mProgramObject && !mMeshDirtyGroup.empty(); |