From f4c8a4ee101828285d8fd1e32e718ecdcbcf1564 Mon Sep 17 00:00:00 2001
From: w1z7ard <w1z7ard@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Sat, 11 Jul 2009 13:39:00 +0000
Subject: [PATCH] commented out the experimental and therefore buggy merge
 code.

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1245 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/libprojectM/PresetMerge.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/libprojectM/PresetMerge.cpp b/src/libprojectM/PresetMerge.cpp
index 05b377ffd..6ea41d75c 100644
--- a/src/libprojectM/PresetMerge.cpp
+++ b/src/libprojectM/PresetMerge.cpp
@@ -11,8 +11,23 @@ void PipelineMerger::MergePipelines(const Pipeline & a, const Pipeline & b, Pipe
 
 	out.screenDecay = lerp( b.screenDecay, a.screenDecay, ratio);
 	out.drawables.clear();
-	
 
+
+	for (std::vector<RenderItem*>::const_iterator pos = a.drawables.begin();
+		pos != a.drawables.end(); ++pos)
+	    {
+	       (*pos)->masterAlpha = invratio;
+	       out.drawables.push_back(*pos);
+	    }
+
+	for (std::vector<RenderItem*>::const_iterator pos = b.drawables.begin(); 
+		pos != b.drawables.end();++pos)
+		{
+		  (*pos)->masterAlpha = ratio;
+		   out.drawables.push_back(*pos);
+		}
+	
+	/*
 	for (RenderItemMatchList::iterator pos = results.matches.begin(); pos != results.matches.end(); ++pos) {		
 				
 		RenderItem * itemA = pos->first;
@@ -29,6 +44,7 @@ void PipelineMerger::MergePipelines(const Pipeline & a, const Pipeline & b, Pipe
 			out.drawables.push_back(itemC);
 		
 	}
+	
 
 	for (std::vector<RenderItem*>::const_iterator pos = results.unmatchedLeft.begin();
 		pos != results.unmatchedLeft.end(); ++pos)
@@ -43,6 +59,7 @@ void PipelineMerger::MergePipelines(const Pipeline & a, const Pipeline & b, Pipe
 		  (*pos)->masterAlpha = ratio;
 		   out.drawables.push_back(*pos);
 		}
+	*/
 
 	if (a.staticPerPixel && b.staticPerPixel)
 	{