2.0. Fixed mix transition.

[casparcg] / core / mixer / image / image_kernel.cpp

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index e659c618b1678a5888aac89054ac98cdc81e35db..1fd83d91d5d8b0b0efd6a32cd21f8c4adaa70c80 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -123,7 +123,14 @@ struct image_kernel::implementation : boost::noncopyable
                }\r
                else\r
                {\r
-                       ogl.blend_func_separate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);                        \r
+                       switch(params.blend_mode)\r
+                       {\r
+                       case blend_mode::mix:\r
+                               ogl.blend_func(GL_ONE, GL_ONE); \r
+                               break;\r
+                       default:                                \r
+                               ogl.blend_func(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); \r
+                       }               \r
                }\r
 \r
                // Setup image-adjustements\r