diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-02-17 19:57:14 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-02-17 20:03:52 +0300 |
| commit | 4d28a1d75fded6176b495b72d843487c35a6890d (patch) | |
| tree | 5b19c98fd04b5a5e0053b2983b3b279ff7e3439f /intern/opencolorio | |
| parent | a7750f95b9f1073d35664c95fda031d0be679bdc (diff) | |
Fix OpenColorIO 2.0 GPU shader error in uniform assignment
And fix a (harmless) compiler warning.
Diffstat (limited to 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/ocio_impl_glsl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index 841f1386af1..590d7c07002 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -252,7 +252,7 @@ static bool createGPUShader(OCIO_GPUShader &shader, /* Set uniforms. */ for (OCIO_GPUUniform &uniform : textures.uniforms) { const GpuShaderDesc::UniformData &data = uniform.data; - const char *name = name; + const char *name = uniform.name.c_str(); if (data.m_getDouble) { GPU_shader_uniform_1f(sh, name, (float)data.m_getDouble()); |