History

Merge branch 'master' of https://github.com/worklist/hifi

Philip Rosedale committed 12 years ago

Commit c8cacf72 parents 41e9017 069008c18 files · +169 −58Browse files

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

Unified · Split

interface/src/Application.cpp+2−0
@@ -1636,6 +1636,8 @@ void Application::updateLOD() { · 1635 unmodified lines
16361636 // adjust it unless we were asked to disable this feature, or if we're currently in throttleRendering mode
16371637 if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableAutoAdjustLOD) && !isThrottleRendering()) {
16381638 Menu::getInstance()->autoAdjustLOD(_fps);
1639+ } else {
1640+ Menu::getInstance()->resetLODAdjust();
16391641 }
16401642 }
16411643

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