Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enabled RenderAnimateTrees. Fixes issue 1101: http://goo.gl/YIvqSY

Browse Source
This commit is contained in:
Salvatore La Bua
2013-09-22 05:52:35 +02:00
parent 67720c6a6a
commit da4196c246
6 changed files with 209 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/lldrawpooltree.cpp
View File

@@ -104,12 +104,12 @@ void LLDrawPoolTree::render(S32 pass)
LLGLState test(GL_ALPHA_TEST, LLGLSLShader::sNoFixedFunction ? 0 : 1);
LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f);
/*static const LLCachedControl<bool> render_animate_trees("RenderAnimateTrees",false);
if (render_animate_trees)
static LLCachedControl<bool> sRenderAnimateTrees("RenderAnimateTrees", false);
if (sRenderAnimateTrees)
{
renderTree();
}
else*/
else
gGL.getTexUnit(sDiffTex)->bind(mTexturep);
for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
@@ -209,7 +209,7 @@ void LLDrawPoolTree::endShadowPass(S32 pass)
gDeferredTreeShadowProgram.unbind();
}
/*
//
void LLDrawPoolTree::renderTree(BOOL selecting)
{
LLGLState normalize(GL_NORMALIZE, TRUE);
@@ -331,7 +331,7 @@ void LLDrawPoolTree::renderTree(BOOL selecting)
//gGL.popMatrix();
}
}
}*/
}//
BOOL LLDrawPoolTree::verify() const
{