diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
| commit | b7f8a2479249646c7fb38ead195d5197ab733c94 (patch) | |
| tree | c1bf4a2b0ecac69a4705827a042ea7f0224ebc54 /indra/newview/lldrawpoolalpha.cpp | |
| parent | c94756d92c7353cb91bfddb5e342f825457e1a7e (diff) | |
| parent | f8749ec9bd03072cc5b50f4cb1a61289b2989c72 (diff) | |
merge up to 3.4.1-release
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 5f2a982ed3..313b310e1e 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); |