From d6898f401a5f5900d13c0a358da8a0d3bb0a198f Mon Sep 17 00:00:00 2001
From: psperl <psperl@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Sat, 11 Aug 2007 00:07:29 +0000
Subject: [PATCH] re-enabling borders

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@318 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-engine/PresetMerge.cpp |  6 ++++++
 src/projectM-engine/PresetMerge.hpp | 12 ++++++++++++
 src/projectM-engine/Renderer.cpp    |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 src/projectM-engine/PresetMerge.cpp
 create mode 100644 src/projectM-engine/PresetMerge.hpp

diff --git a/src/projectM-engine/PresetMerge.cpp b/src/projectM-engine/PresetMerge.cpp
new file mode 100644
index 000000000..7aa9698e7
--- /dev/null
+++ b/src/projectM-engine/PresetMerge.cpp
@@ -0,0 +1,6 @@
+#include "PresetMerge.hpp"
+
+void PresetMerger::MergePresets(PresetOutputs *A, const PresetOutputs *B, double ratio)
+{
+  return;
+}
diff --git a/src/projectM-engine/PresetMerge.hpp b/src/projectM-engine/PresetMerge.hpp
new file mode 100644
index 000000000..86b0418ba
--- /dev/null
+++ b/src/projectM-engine/PresetMerge.hpp
@@ -0,0 +1,12 @@
+#ifndef PRESET_MERGE_HPP
+#define PRESET_MERGE_HPP
+#include "Preset.hpp"
+
+class PresetMerger 
+{
+public:
+    void MergePresets(PresetOutputs *A, const PresetOutputs *B, double ratio);
+
+};
+
+#endif
diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp
index cfdf0a2f8..6cbeea6f5 100644
--- a/src/projectM-engine/Renderer.cpp
+++ b/src/projectM-engine/Renderer.cpp
@@ -156,7 +156,7 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
       draw_custom_waves(presetOutputs);
     draw_waveform(presetOutputs, presetInputs);
     if(presetOutputs->bDarkenCenter)darken_center();
-    // draw_borders(presetOutputs);               //draw borders
+     draw_borders(presetOutputs);               //draw borders
 
     /** Restore original view state */
     glMatrixMode( GL_MODELVIEW );