From 6a04ff11afe5e59b29169e2466152028a9d8e904 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 27 Apr 2013 17:08:37 +0000 Subject: Premultiplication in OCIO shader went wrong, it used to apply alpha on source color after conversion, not on result. --- intern/opencolorio/ocio_impl_glsl.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/opencolorio') diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index 13c2fc07a9a..0f8ab5b9905 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -100,9 +100,9 @@ static const char *g_fragShaderText = "" "\n" " gl_FragColor = OCIODisplay(col, tex2);\n" "\n" -" col[0] *= alpha;\n" -" col[1] *= alpha;\n" -" col[2] *= alpha;\n" +" gl_FragColor[0] *= alpha;\n" +" gl_FragColor[1] *= alpha;\n" +" gl_FragColor[2] *= alpha;\n" " }\n" "\n" "}\n"; -- cgit v1.2.3