History

Merge pull request #641 from ZappoMan/bug_fixes

Two small bug fixes

Philip Rosedale committed 13 years ago

Commit 8ea2b462 parents 8adf713 1439b474 files · +10 −6Browse files

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

Unified · Split

interface/src/Application.cpp+3−3
@@ -1689,8 +1689,6 @@ void Application::init() { · 1688 unmodified lines
16891689 _headMouseX = _mouseX = _glWidget->width() / 2;
16901690 _headMouseY = _mouseY = _glWidget->height() / 2;
16911691
1692− _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);
1693−
16941692 _myAvatar.init();
16951693 _myAvatar.setPosition(START_LOCATION);
16961694 _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);
@@ -1716,7 +1714,6 @@ void Application::init() { · 19 unmodified lines
17161714
17171715 printLog("Loaded settings.\n");
17181716
1719−
17201717 sendAvatarVoxelURLMessage(_myAvatar.getVoxels()->getVoxelURL());
17211718
17221719 _palette.init(_glWidget->width(), _glWidget->height());
@@ -2290,6 +2287,9 @@ void Application::displaySide(Camera& whichCamera) { · 567 unmodified lines
22902287 glMateriali(GL_FRONT, GL_SHININESS, 96);
22912288
22922289 if (_renderStarsOn->isChecked()) {
2290+ if (!_stars.getFileLoaded()) {
2291+ _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);
2292+ }
22932293 // should be the first rendering pass - w/o depth buffer / lighting
22942294
22952295 // compute starfield alpha based on distance from atmosphere

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