diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-29 01:51:50 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-29 01:51:50 +0300 |
| commit | 3435c9a2c18f20cdb307f4fcfa66b476f3625ed8 (patch) | |
| tree | b8b0c6b0d1f1835013f8f036529813fb3f12e619 /source/blender | |
| parent | fe80b6ceace8d42ffdd467d506fec02f42a9f972 (diff) | |
| parent | afdc35b6367bd8118098ca8b9612bc81144fe415 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/gpu/opengl/gl_shader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index 79182ea05e6..9bfb53885e2 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -416,9 +416,9 @@ std::string GLShader::resources_declare(const ShaderCreateInfo &info) const ss << ";\n"; } for (const ShaderCreateInfo::PushConst &uniform : info.push_constants_) { - /* T95278: Double macro to avoid some compilers think it is recusive. */ + /* T95278: Double macro to avoid some compilers think it is recursive. */ ss << "#define " << uniform.name << "_ " << uniform.name << "\n"; - ss << "#define " << uniform.name << " (" << uniform.name << _ ")\n"; + ss << "#define " << uniform.name << " (" << uniform.name << "_)\n"; } ss << "\n"; return ss.str(); |