Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -1541,6 +1541,9 @@ void Application::init() { · 1540 unmodified lines | |||
| 1541 | _sharedVoxelSystemViewFrustum.setOrientation(glm::quat()); | 1541 | _sharedVoxelSystemViewFrustum.setOrientation(glm::quat()); |
| 1542 | _sharedVoxelSystemViewFrustum.calculate(); | 1542 | _sharedVoxelSystemViewFrustum.calculate(); |
| 1543 | _sharedVoxelSystem.setViewFrustum(&_sharedVoxelSystemViewFrustum); | 1543 | _sharedVoxelSystem.setViewFrustum(&_sharedVoxelSystemViewFrustum); |
| 1544 | |||
| 1545 | VoxelNode::removeUpdateHook(&_sharedVoxelSystem); | ||
| 1546 | |||
| 1544 | _sharedVoxelSystem.init(); | 1547 | _sharedVoxelSystem.init(); |
| 1545 | VoxelTree* tmpTree = _sharedVoxelSystem.getTree(); | 1548 | VoxelTree* tmpTree = _sharedVoxelSystem.getTree(); |
| 1546 | _sharedVoxelSystem.changeTree(&_clipboard); | 1549 | _sharedVoxelSystem.changeTree(&_clipboard); |
| @@ -1588,6 +1591,7 @@ void Application::init() { · 41 unmodified lines | |||
| 1588 | // Set up VoxelSystem after loading preferences so we can get the desired max voxel count | 1591 | // Set up VoxelSystem after loading preferences so we can get the desired max voxel count |
| 1589 | _voxels.setMaxVoxels(Menu::getInstance()->getMaxVoxels()); | 1592 | _voxels.setMaxVoxels(Menu::getInstance()->getMaxVoxels()); |
| 1590 | _voxels.setUseVoxelShader(Menu::getInstance()->isOptionChecked(MenuOption::UseVoxelShader)); | 1593 | _voxels.setUseVoxelShader(Menu::getInstance()->isOptionChecked(MenuOption::UseVoxelShader)); |
| 1594 | _voxels.setUseFastVoxelPipeline(Menu::getInstance()->isOptionChecked(MenuOption::FastVoxelPipeline)); | ||
| 1591 | _voxels.init(); | 1595 | _voxels.init(); |
| 1592 | 1596 | ||
| 1593 | 1597 | ||