Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed clipboard not being previewed

Browse source
This commit is contained in:
atlante45 2013-08-21 10:31:56 -07:00
parent 3eb5ace715
commit 27b0338294
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/VoxelImporter.cpp
View file

@ -70,7 +70,9 @@ void VoxelImporter::reset() {
} }
int VoxelImporter::exec() { int VoxelImporter::exec() {
if (!_initialized) { reset();
if (_initialized) {
_voxelSystem->init(); _voxelSystem->init();
_importViewFrustum.setKeyholeRadius(100000.0f); _importViewFrustum.setKeyholeRadius(100000.0f);
_importViewFrustum.calculate(); _importViewFrustum.calculate();
@ -78,7 +80,6 @@ int VoxelImporter::exec() {
_initialized = true; _initialized = true;
} }
reset();
int ret = _importDialog.exec(); int ret = _importDialog.exec();
if (!ret) { if (!ret) {

1
interface/src/VoxelSystem.cpp
View file

@ -1314,6 +1314,7 @@ void VoxelSystem::createSphere(float r,float xc, float yc, float zc, float s, bo
void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelSystem* destinationTree, bool rebaseToRoot) { void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelSystem* destinationTree, bool rebaseToRoot) {
_tree->copySubTreeIntoNewTree(startNode, destinationTree->_tree, rebaseToRoot); _tree->copySubTreeIntoNewTree(startNode, destinationTree->_tree, rebaseToRoot);
destinationTree->setupNewVoxelsForDrawing();
} }
void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelTree* destinationTree, bool rebaseToRoot) { void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelTree* destinationTree, bool rebaseToRoot) {