From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Fri, 19 Aug 2011 14:14:46 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~106
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=16dcd58ce3965cc8b004a1dac66e12171a9078f3;p=casparcg

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

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index b2b03475b..bd75820e0 100644
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -59,7 +59,7 @@ GLubyte lower_pattern[] = {
 struct image_kernel::implementation : boost::noncopyable
 {	
 	std::shared_ptr<shader>	shader_;
-	bool					blend_modes_;
+	bool					advanced_blend_modes_;
 							
 	void draw(ogl_device&									ogl,
 			  render_item&&									item,
@@ -97,7 +97,7 @@ struct image_kernel::implementation : boost::noncopyable
 		// Setup shader
 
 		if(!shader_)
-			shader_ = get_image_shader(ogl, blend_modes_);
+			shader_ = get_image_shader(ogl, advanced_blend_modes_);
 						
 		ogl.use(*shader_);
 
@@ -114,7 +114,7 @@ struct image_kernel::implementation : boost::noncopyable
 		
 		// Setup blend_func
 		
-		if(blend_modes_)
+		if(advanced_blend_modes_)
 		{
 			background->bind(6);
 
@@ -230,7 +230,7 @@ struct image_kernel::implementation : boost::noncopyable
 		item.textures.clear();
 		ogl.yield(); // Return resources to pool as early as possible.
 
-		if(blend_modes_)
+		if(advanced_blend_modes_)
 		{
 			// http://www.opengl.org/registry/specs/NV/texture_barrier.txt
 			// This allows us to use framebuffer (background) both as source and target while blending.