fixing merge

This commit is contained in:
stojce 2014-01-17 00:08:25 +01:00
parent 8919d664f4
commit 669ab213ef

View file

@ -1805,7 +1805,7 @@ void Application::init() {
_sharedVoxelSystem.changeTree(&_clipboard);
delete tmpTree;
_voxelImporter.init();
_voxelImporter.init(_settings);
_environment.init();