[Bf-blender-cvs] [a410cea291a] master: Fix prefix used for display OCIO shader
Sergey Sharybin
noreply at git.blender.org
Fri Apr 8 11:28:46 CEST 2022
Commit: a410cea291a118187efdca8b440c27df69dd7bd5
Author: Sergey Sharybin
Date: Fri Apr 8 11:27:51 2022 +0200
Branches: master
https://developer.blender.org/rBa410cea291a118187efdca8b440c27df69dd7bd5
Fix prefix used for display OCIO shader
Didn't notice this to have real harmful behavior, but is still best
to do things properly.
===================================================================
M intern/opencolorio/ocio_impl_glsl.cc
===================================================================
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index fcaab5dd752..87f9d8837c7 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -619,7 +619,7 @@ static OCIO_GPUDisplayShader &getGPUDisplayShader(
GpuShaderDescRcPtr shaderdesc_to_display = GpuShaderDesc::CreateShaderDesc();
shaderdesc_to_display->setLanguage(GPU_LANGUAGE_GLSL_1_3);
shaderdesc_to_display->setFunctionName("OCIO_to_display");
- shaderdesc_to_scene_linear->setResourcePrefix("to_display");
+ shaderdesc_to_display->setResourcePrefix("to_display");
(*(ConstProcessorRcPtr *)processor_to_display)
->getDefaultGPUProcessor()
->extractGpuShaderInfo(shaderdesc_to_display);
More information about the Bf-blender-cvs
mailing list