diff options
author | chai <chaifix@163.com> | 2018-11-26 08:37:17 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-11-26 08:37:17 +0800 |
commit | 24b712a956a48f43788e1c11e121aedf52e22278 (patch) | |
tree | 0bbccc98f1cb24c44cfb58ca99ce305b9f513e09 /src/libjin/graphics/shaders/je_shader.cpp | |
parent | 1d54138b94a384917d47abd8109c586b1b7ac323 (diff) |
*粒子系统
Diffstat (limited to 'src/libjin/graphics/shaders/je_shader.cpp')
-rw-r--r-- | src/libjin/graphics/shaders/je_shader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |