Showing the changes to interface/src/VoxelSystem.cpp (1 of 1 file). Show all
Unified · Split
| @@ -1312,13 +1312,13 @@ void VoxelSystem::createSphere(float r,float xc, float yc, float zc, float s, bo · 1311 unmodified lines | |||
| 1312 | setupNewVoxelsForDrawing(); | 1312 | setupNewVoxelsForDrawing(); |
| 1313 | }; | 1313 | }; |
| 1314 | 1314 | ||
| 1315 | void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelSystem* destinationTree, bool rebaseToRoot) { | 1315 | void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelSystem* destination, bool rebaseToRoot) { |
| 1316 | _tree->copySubTreeIntoNewTree(startNode, destinationTree->_tree, rebaseToRoot); | 1316 | _tree->copySubTreeIntoNewTree(startNode, destination->_tree, rebaseToRoot); |
| 1317 | destinationTree->setupNewVoxelsForDrawing(); | 1317 | destination->setupNewVoxelsForDrawing(); |
| 1318 | } | 1318 | } |
| 1319 | 1319 | ||
| 1320 | void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelTree* destinationTree, bool rebaseToRoot) { | 1320 | void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelTree* destination, bool rebaseToRoot) { |
| 1321 | _tree->copySubTreeIntoNewTree(startNode, destinationTree, rebaseToRoot); | 1321 | _tree->copySubTreeIntoNewTree(startNode, destination, rebaseToRoot); |
| 1322 | } | 1322 | } |
| 1323 | 1323 | ||
| 1324 | void VoxelSystem::copyFromTreeIntoSubTree(VoxelTree* sourceTree, VoxelNode* destinationNode) { | 1324 | void VoxelSystem::copyFromTreeIntoSubTree(VoxelTree* sourceTree, VoxelNode* destinationNode) { |