aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpooltree.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lldrawpooltree.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/linden/indra/newview/lldrawpooltree.cpp b/linden/indra/newview/lldrawpooltree.cpp
index fd1ca8e..fd0a83c 100644
--- a/linden/indra/newview/lldrawpooltree.cpp
+++ b/linden/indra/newview/lldrawpooltree.cpp
@@ -67,9 +67,6 @@ void LLDrawPoolTree::prerender()
67void LLDrawPoolTree::beginRenderPass(S32 pass) 67void LLDrawPoolTree::beginRenderPass(S32 pass)
68{ 68{
69 LLFastTimer t(LLFastTimer::FTM_RENDER_TREES); 69 LLFastTimer t(LLFastTimer::FTM_RENDER_TREES);
70 glEnableClientState(GL_VERTEX_ARRAY);
71 glEnableClientState(GL_NORMAL_ARRAY);
72 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
73 glAlphaFunc(GL_GREATER, 0.5f); 70 glAlphaFunc(GL_GREATER, 0.5f);
74 71
75 if (LLPipeline::sUnderWaterRender) 72 if (LLPipeline::sUnderWaterRender)
@@ -110,9 +107,7 @@ void LLDrawPoolTree::endRenderPass(S32 pass)
110{ 107{
111 LLFastTimer t(LLFastTimer::FTM_RENDER_TREES); 108 LLFastTimer t(LLFastTimer::FTM_RENDER_TREES);
112 glAlphaFunc(GL_GREATER, 0.01f); 109 glAlphaFunc(GL_GREATER, 0.01f);
113 glDisableClientState(GL_NORMAL_ARRAY); 110
114 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
115
116 if (gPipeline.canUseWindLightShadersOnObjects()) 111 if (gPipeline.canUseWindLightShadersOnObjects())
117 { 112 {
118 shader->unbind(); 113 shader->unbind();
@@ -126,9 +121,6 @@ void LLDrawPoolTree::renderForSelect()
126 return; 121 return;
127 } 122 }
128 123
129 glEnableClientState (GL_VERTEX_ARRAY);
130 glEnableClientState (GL_TEXTURE_COORD_ARRAY);
131
132 LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f); 124 LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f);
133 125
134 LLGLSObjectSelectAlpha gls_alpha; 126 LLGLSObjectSelectAlpha gls_alpha;
@@ -155,7 +147,6 @@ void LLDrawPoolTree::renderForSelect()
155 gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 147 gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
156 148
157 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 149 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
158 glDisableClientState (GL_TEXTURE_COORD_ARRAY);
159} 150}
160 151
161void LLDrawPoolTree::renderTree(BOOL selecting) 152void LLDrawPoolTree::renderTree(BOOL selecting)
@@ -278,8 +269,6 @@ void LLDrawPoolTree::renderTree(BOOL selecting)
278 //glPopMatrix(); 269 //glPopMatrix();
279 } 270 }
280 } 271 }
281
282 addIndicesDrawn(indices_drawn);
283} 272}
284 273
285BOOL LLDrawPoolTree::verify() const 274BOOL LLDrawPoolTree::verify() const