Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-04-27 21:08:37 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-04-27 21:08:37 +0400
commit6a04ff11afe5e59b29169e2466152028a9d8e904 (patch)
tree0fdb5b1e77824bec0418d08ab0834af141da8fb9 /intern/opencolorio
parentd376a1b7405ab5825791a0caea20391d5ad6163d (diff)
Premultiplication in OCIO shader went wrong,
it used to apply alpha on source color after conversion, not on result.
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/ocio_impl_glsl.cc6
1 files changed, 3 insertions, 3 deletions
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";