From 24b712a956a48f43788e1c11e121aedf52e22278 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 26 Nov 2018 08:37:17 +0800 Subject: =?UTF-8?q?*=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/graphics/shaders/je_shader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libjin/graphics/shaders/je_shader.cpp') diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/je_shader.cpp index c1abbf0..3748de6 100644 --- a/src/libjin/graphics/shaders/je_shader.cpp +++ b/src/libjin/graphics/shaders/je_shader.cpp @@ -52,7 +52,7 @@ namespace JinEngine // const int DEFAULT_TEXTURE_UNIT = 0; - /*static*/ Shader* Shader::CurrentShader = nullptr; + Shader* Shader::CurrentShader = nullptr; Shader* Shader::createShader(const string& program) { @@ -134,7 +134,7 @@ if (success == GL_FALSE) \ sendInt(SHADER_MAIN_TEXTURE, DEFAULT_TEXTURE_UNIT); } - /*static*/ void Shader::unuse() + void Shader::unuse() { glUseProgram(0); CurrentShader = nullptr; -- cgit v1.1-26-g67d0