X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fimage%2Fimage_shader.cpp;h=85ceb4cca1ccdd2e7bd1529a7155a6ea74f75dfe;hb=116e09a218cf056e4de868454b0fe26dc4db1413;hp=d9b83877f74da3c52da6e0e34b8d98fa86d42d2e;hpb=a8e71e9b2452413398ac10f0b6e2dea41cecdec5;p=casparcg

diff --git a/core/mixer/image/image_shader.cpp b/core/mixer/image/image_shader.cpp
index d9b83877f..85ceb4cca 100644
--- a/core/mixer/image/image_shader.cpp
+++ b/core/mixer/image/image_shader.cpp
@@ -69,7 +69,11 @@ std::string get_blend_color_func()
 	"																					\n"																			  
 	"vec4 blend(vec4 fore)																\n"
 	"{																					\n"
-	"   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;						\n"
+	"   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;						\n"	
+	"																					\n"		
+	"	if(blend_mode == 29) // mix														\n"
+	"		return fore + back;															\n"
+	"																					\n"		
 	"	fore.rgb = get_blend_color(back.rgb, fore.rgb);									\n"
 	"	return fore + (1.0-fore.a)*back;												\n"
 	"}																					\n";			
@@ -115,6 +119,7 @@ std::string get_fragment(bool blend_modes)
 	"uniform bool		has_local_key;													\n"
 	"uniform bool		has_layer_key;													\n"
 	"uniform int		blend_mode;														\n"
+	"uniform int		alpha_mode;														\n"
 	"uniform int		pixel_format;													\n"
 	"																					\n"
 	"uniform float		opacity;														\n"