History

fixing merge

stojce committed 12 years ago

Commit 669ab211 parent 8919d661 file · +1 −1Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+1−1
@@ -1805,7 +1805,7 @@ void Application::init() { · 1804 unmodified lines
18051805 _sharedVoxelSystem.changeTree(&_clipboard);
18061806 delete tmpTree;
18071807
1808− _voxelImporter.init();
1808+ _voxelImporter.init(_settings);
18091809
18101810 _environment.init();
18111811

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t