From b3e22bce0ac9e368c76ad7bbbe22230991e51c71 Mon Sep 17 00:00:00 2001 From: MC Return Date: Mon, 30 Jul 2012 19:29:12 +0200 Subject: Reduced the scope of the variable 'TextureObjectLocation' in IconRenderer.cpp (bzr r2528.1.22) --- unity-shared/IconRenderer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'unity-shared') diff --git a/unity-shared/IconRenderer.cpp b/unity-shared/IconRenderer.cpp index 9a7d7c9fe..ed1fa65e6 100644 --- a/unity-shared/IconRenderer.cpp +++ b/unity-shared/IconRenderer.cpp @@ -757,7 +757,6 @@ void IconRenderer::RenderElement(nux::GraphicsEngine& GfxContext, CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0)); CHECKGL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); - int TextureObjectLocation; int VertexLocation; int TextureCoord0Location; int FragmentColor = 0; @@ -768,7 +767,7 @@ void IconRenderer::RenderElement(nux::GraphicsEngine& GfxContext, { local::shader_program_uv_persp_correction->Begin(); - TextureObjectLocation = local::shader_program_uv_persp_correction->GetUniformLocationARB("TextureObject0"); + int TextureObjectLocation = local::shader_program_uv_persp_correction->GetUniformLocationARB("TextureObject0"); VertexLocation = local::shader_program_uv_persp_correction->GetAttributeLocation("iVertex"); TextureCoord0Location = local::shader_program_uv_persp_correction->GetAttributeLocation("iTexCoord0"); FragmentColor = local::shader_program_uv_persp_correction->GetUniformLocationARB("color0"); -- cgit v1.2.3