diff options
author | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
commit | 8465910c79b8e746e04fd581cca2d60399e569b9 (patch) | |
tree | f43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/lldrawpoolalpha.cpp | |
parent | Second Life viewer sources 1.18.2.1 (diff) | |
download | meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2 meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz |
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to 'linden/indra/newview/lldrawpoolalpha.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpoolalpha.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/lldrawpoolalpha.cpp b/linden/indra/newview/lldrawpoolalpha.cpp index 8866c1e..a502580 100644 --- a/linden/indra/newview/lldrawpoolalpha.cpp +++ b/linden/indra/newview/lldrawpoolalpha.cpp | |||
@@ -219,9 +219,9 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask, std::vector<LLSpatialGroup* | |||
219 | last_part = part; | 219 | last_part = part; |
220 | } | 220 | } |
221 | 221 | ||
222 | std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[LLRenderPass::PASS_ALPHA]; | 222 | LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[LLRenderPass::PASS_ALPHA]; |
223 | 223 | ||
224 | for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k) | 224 | for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) |
225 | { | 225 | { |
226 | LLDrawInfo& params = **k; | 226 | LLDrawInfo& params = **k; |
227 | 227 | ||
@@ -245,7 +245,7 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask | |||
245 | { | 245 | { |
246 | BOOL light_enabled = TRUE; | 246 | BOOL light_enabled = TRUE; |
247 | 247 | ||
248 | std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type]; | 248 | LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[type]; |
249 | 249 | ||
250 | U32 prim_type = GL_TRIANGLES; | 250 | U32 prim_type = GL_TRIANGLES; |
251 | 251 | ||
@@ -272,7 +272,7 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask | |||
272 | glPointSize(width/(view*view)); | 272 | glPointSize(width/(view*view)); |
273 | }*/ | 273 | }*/ |
274 | 274 | ||
275 | for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k) | 275 | for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) |
276 | { | 276 | { |
277 | LLDrawInfo& params = **k; | 277 | LLDrawInfo& params = **k; |
278 | if (texture && params.mTexture.notNull()) | 278 | if (texture && params.mTexture.notNull()) |