From b69a0c914e7a5a5f970bb98831592b2b417c4de8 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 5 May 2014 20:33:21 +0200
Subject: Fixed a flipped condition in cBlockArea::Merge().

---
 src/BlockArea.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp
index e0ae2c5b6..897af27c4 100644
--- a/src/BlockArea.cpp
+++ b/src/BlockArea.cpp
@@ -707,11 +707,11 @@ void cBlockArea::Merge(const cBlockArea & a_Src, int a_RelX, int a_RelY, int a_R
 	
 	if (IsDummyMetas)
 	{
-		MergeByStrategy<true>(a_Src, a_RelX, a_RelY, a_RelZ, a_Strategy, SrcMetas, DstMetas);
+		MergeByStrategy<false>(a_Src, a_RelX, a_RelY, a_RelZ, a_Strategy, SrcMetas, DstMetas);
 	}
 	else
 	{
-		MergeByStrategy<false>(a_Src, a_RelX, a_RelY, a_RelZ, a_Strategy, SrcMetas, DstMetas);
+		MergeByStrategy<true>(a_Src, a_RelX, a_RelY, a_RelZ, a_Strategy, SrcMetas, DstMetas);
 	}
 }
 
-- 
cgit v1.2.3