Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear

This commit is contained in:
Lirusaito
2012-07-08 11:28:47 -04:00
3 changed files with 13 additions and 6 deletions

View File

@@ -170,7 +170,7 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable)
static const unsigned int indices_per_quad = 6;
static const LLCachedControl<bool> render_transparent_water("RenderTransparentWater",false);
const S32 size = (render_transparent_water && !LLGLSLShader::sNoFixedFunction) ? 16 : 1;
const S32 size = (render_transparent_water && LLGLSLShader::sNoFixedFunction) ? 16 : 1;
const S32 num_quads = size * size;
face->setSize(vertices_per_quad * num_quads,
indices_per_quad * num_quads);