From 669ab213efc1beb07f7df253ebc94983eb8ed9a2 Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Fri, 17 Jan 2014 00:08:25 +0100
Subject: [PATCH] fixing merge

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 56632d1cd9..679fffe222 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1805,7 +1805,7 @@ void Application::init() {
     _sharedVoxelSystem.changeTree(&_clipboard);
     delete tmpTree;
 
-    _voxelImporter.init();
+    _voxelImporter.init(_settings);
 
     _environment.init();