[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56343] trunk/blender/intern/opencolorio/ ocio_impl_glsl.cc: Premultiplication in OCIO shader went wrong,

Sergey Sharybin sergey.vfx at gmail.com
Sat Apr 27 19:08:38 CEST 2013


Revision: 56343
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56343
Author:   nazgul
Date:     2013-04-27 17:08:37 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Premultiplication in OCIO shader went wrong,
it used to apply alpha on source color after
conversion, not on result.

Modified Paths:
--------------
    trunk/blender/intern/opencolorio/ocio_impl_glsl.cc

Modified: trunk/blender/intern/opencolorio/ocio_impl_glsl.cc
===================================================================
--- trunk/blender/intern/opencolorio/ocio_impl_glsl.cc	2013-04-27 16:43:15 UTC (rev 56342)
+++ trunk/blender/intern/opencolorio/ocio_impl_glsl.cc	2013-04-27 17:08:37 UTC (rev 56343)
@@ -100,9 +100,9 @@
 "\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";




More information about the Bf-blender-cvs mailing list