From 1bc95d9c55e9f88ca5049b136c91f87ba740c5d3 Mon Sep 17 00:00:00 2001
From: kazu <support@frank-ebner.de>
Date: Sat, 12 May 2018 11:11:39 +0200
Subject: [PATCH] fixed merge issue...

---
 mapview/3D/floorplan/FloorplanRendererModel.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mapview/3D/floorplan/FloorplanRendererModel.h b/mapview/3D/floorplan/FloorplanRendererModel.h
index 7c80ddd..08e04b0 100644
--- a/mapview/3D/floorplan/FloorplanRendererModel.h
+++ b/mapview/3D/floorplan/FloorplanRendererModel.h
@@ -89,20 +89,19 @@ public:
 
 	void rebuild(Floorplan::IndoorMap* im) {
 
-<<<<<<< HEAD
 		// rebuild the mesh
-		Ray3D::ModelFactory fac(im);
-		fac.exportDoors = showDoors;
-		mesh = fac.getMesh();
+        //Ray3D::ModelFactory fac(im);
+
+        //mesh = fac.getMesh();
+
 
-=======
->>>>>>> 45592899ee7de1a99f3086205788ff43398fad41
 		triaTransp.clear();
 		triaSolid.clear();
 
 		// rebuild the mesh
 		try {
 			Ray3D::ModelFactory fac(im);
+            fac.exportDoors = showDoors;
 			mesh = fac.getMesh();
 			for (const Ray3D::Obstacle3D& obs : mesh.elements) {
 				const int matID = getMaterial(obs);