diff options
| author | Don Kjer <don@lindenlab.com> | 2012-07-17 16:52:19 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-07-17 16:52:19 +0000 |
| commit | cff3469d46d297fbec34bc0d648588e900cd255c (patch) | |
| tree | d768ddbc8712c9e81387ae4b03dd8227229a0fe1 /indra/newview/lldrawpoolalpha.cpp | |
| parent | 5a473a42a63d3277c65bb3bc96e49f020508cfe8 (diff) | |
| parent | 509408f393b8eb58799678adde801675a4d4d600 (diff) | |
Merge viewer-development -> viewer-horde-fixes
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 5f2a982ed3..b4f6bf9383 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -348,7 +348,7 @@ void LLDrawPoolAlpha::render(S32 pass) void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) { - for (LLCullResult::sg_list_t::iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i) + for (LLCullResult::sg_iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i) { LLSpatialGroup* group = *i; if (group->mSpatialPartition->mRenderByGroup && @@ -385,7 +385,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) BOOL use_shaders = gPipeline.canUseVertexShaders(); - for (LLCullResult::sg_list_t::iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i) + for (LLCullResult::sg_iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i) { LLSpatialGroup* group = *i; llassert(group); @@ -411,6 +411,12 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) continue; } + if ((params.mVertexBuffer->getTypeMask() & mask) != mask) + { //FIXME! + llwarns << "Missing required components, skipping render batch." << llendl; + continue; + } + LLRenderPass::applyModelMatrix(params); |