2.0. image_mixer: Key frames should not have blending modes.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1018 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index aa5236c16189ffbf26a6d98531ff2c4e32617bf0..3038be929d01c44ad67d8c96d1f6d426c42be808 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -280,7 +280,7 @@ struct image_kernel::implementation : boost::noncopyable
                shader_->set("is_hd",                   pix_desc.planes.at(0).height > 700 ? 1 : 0);\r
                shader_->set("has_local_key",   local_key ? 1 : 0);\r
                shader_->set("has_layer_key",   layer_key ? 1 : 0);\r
-               shader_->set("blend_mode",              transform.get_blend_mode());\r
+               shader_->set("blend_mode",              transform.get_is_key() ? core::image_transform::blend_mode::normal : transform.get_blend_mode());\r
                shader_->set("alpha_mode",              transform.get_alpha_mode());\r
                shader_->set("interlace_mode",  transform.get_mode());\r
                shader_->set("pixel_format",    pix_desc.pix_fmt);      \r