From ddfa2c7ad553b671c6c7dd8485df099a846d9128 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Thu, 15 Oct 2015 17:19:47 -0600
Subject: [PATCH] merge: don't merge detail and non-detail

---
 qbsp/merge.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qbsp/merge.c b/qbsp/merge.c
index fc6c324a..c0e43e7c 100644
--- a/qbsp/merge.c
+++ b/qbsp/merge.c
@@ -73,7 +73,9 @@ TryMerge(face_t *f1, face_t *f2)
 	f1->planeside != f2->planeside ||
 	f1->texinfo != f2->texinfo ||
 	f1->contents[0] != f2->contents[0] ||
-	f1->contents[1] != f2->contents[1])
+	f1->contents[1] != f2->contents[1] ||
+        f1->cflags[0] != f2->cflags[0] ||
+        f1->cflags[1] != f2->cflags[1])
 	return NULL;
 
     // find a common edge