aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lldrawpoolbump.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index b0b8b02..a78dc94 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -350,9 +350,9 @@ void LLDrawPoolBump::renderActive(U32 type, U32 mask, BOOL texture)
350 350
351void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE) 351void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE)
352{ 352{
353 std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type]; 353 LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[type];
354 354
355 for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k) 355 for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k)
356 { 356 {
357 LLDrawInfo& params = **k; 357 LLDrawInfo& params = **k;
358 if (LLPipeline::sDynamicReflections) 358 if (LLPipeline::sDynamicReflections)
@@ -899,9 +899,9 @@ void LLDrawPoolBump::renderBump(U32 type, U32 mask)
899 LLGLState::checkClientArrays(mask); 899 LLGLState::checkClientArrays(mask);
900#endif 900#endif
901 901
902 std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[type]; 902 LLSpatialGroup::drawmap_elem_t& draw_info = gPipeline.mRenderMap[type];
903 903
904 for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i) 904 for (LLSpatialGroup::drawmap_elem_t::iterator i = draw_info.begin(); i != draw_info.end(); ++i)
905 { 905 {
906 LLDrawInfo& params = **i; 906 LLDrawInfo& params = **i;
907 907
@@ -914,9 +914,9 @@ void LLDrawPoolBump::renderBump(U32 type, U32 mask)
914 914
915void LLDrawPoolBump::renderGroupBump(LLSpatialGroup* group, U32 type, U32 mask) 915void LLDrawPoolBump::renderGroupBump(LLSpatialGroup* group, U32 type, U32 mask)
916{ 916{
917 const std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type]; 917 LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[type];
918 918
919 for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k) 919 for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k)
920 { 920 {
921 LLDrawInfo& params = **k; 921 LLDrawInfo& params = **k;
922 922