History

Merge pull request #1785 from birarda/post-event

repairs to VoxelImporter to remove warning, closes #1758

AndrewMeadows committed 12 years ago

Commit f277e002 parents 9a4e810 217135a4 files · +18 −20Browse files

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

Unified · Split

interface/src/Application.cpp+8−6
@@ -117,11 +117,10 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 116 unmodified lines
117117 _frameCount(0),
118118 _fps(120.0f),
119119 _justStarted(true),
120− _voxelImporter(_window),
120+ _voxelImporter(NULL),
121121 _wantToKillLocalVoxels(false),
122122 _audioScope(256, 200, true),
123− _avatarManager(),
124− _myAvatar(NULL),
123+ _myAvatar(),
125124 _profile(QString()),
126125 _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)),
127126 _mouseX(0),
@@ -1673,7 +1672,12 @@ void Application::exportVoxels() { · 1545 unmodified lines
16731672 }
16741673
16751674 void Application::importVoxels() {
1676− if (_voxelImporter.exec()) {
1675+ if (!_voxelImporter) {
1676+ _voxelImporter = new VoxelImporter(_window);
1677+ _voxelImporter->init(_settings);
1678+ }
1679+
1680+ if (_voxelImporter->exec()) {
16771681 qDebug("[DEBUG] Import succeeded.");
16781682 } else {
16791683 qDebug("[DEBUG] Import failed.");
@@ -1813,8 +1817,6 @@ void Application::init() { · 133 unmodified lines
18131817 _sharedVoxelSystem.changeTree(&_clipboard);
18141818 delete tmpTree;
18151819
1816− _voxelImporter.init(_settings);
1817−
18181820 _environment.init();
18191821
18201822 _glowEffect.init();

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