[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56358] trunk/blender/intern/opencolorio/ ocio_impl_glsl.cc: Keeping my commit count high!

Ton Roosendaal ton at blender.org
Sun Apr 28 13:05:49 CEST 2013


Revision: 56358
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56358
Author:   ton
Date:     2013-04-28 11:05:49 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
Keeping my commit count high!

Previous GLSL code had error, the if() statement had to be negated.

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-28 11:03:01 UTC (rev 56357)
+++ trunk/blender/intern/opencolorio/ocio_impl_glsl.cc	2013-04-28 11:05:49 UTC (rev 56358)
@@ -92,7 +92,7 @@
 "void main()\n"
 "{\n"
 "    vec4 col = texture2D(tex1, gl_TexCoord[0].st);\n"
-"    if (predivide == false || col[3] <= 0.0 || col[3] >= 1.0) {\n"
+"    if (predivide && col[3] > 0.0 && col[3] < 1.0) {\n"
 "        float inv_alpha = 1.0 / col[3];\n"
 "        col[0] *= inv_alpha;\n"
 "        col[1] *= inv_alpha;\n"




More information about the Bf-blender-cvs mailing list