diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 18:06:11 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 18:19:01 +0200 |
| commit | 214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5 (patch) | |
| tree | f06145cf70bf7860abd2c6edf88e2294d4ecb830 /src/shader | |
| parent | 74387c54e35e0f8f6bf1dcc7b7b171a3ec6db212 (diff) | |
| download | qtlocation-mapboxgl-214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5.tar.gz | |
fix variable shadowing
Diffstat (limited to 'src/shader')
| -rw-r--r-- | src/shader/shader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shader/shader.cpp b/src/shader/shader.cpp index 91c9b58c89..d9f63cae12 100644 --- a/src/shader/shader.cpp +++ b/src/shader/shader.cpp @@ -8,8 +8,8 @@ using namespace mbgl; -Shader::Shader(const char *name, const GLchar *vertSource, const GLchar *fragSource) - : name(name), +Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSource) + : name(name_), valid(false), program(0) { util::timer timer("shader compilation", Event::Shader); |