mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 23:16:50 +02:00
Merge fixes
This commit is contained in:
parent
ab1a89a6f9
commit
b191ad866f
1 changed files with 3 additions and 3 deletions
|
@ -7543,10 +7543,10 @@ void Application::updateDisplayMode() {
|
||||||
standard.insert(std::end(standard), std::begin(advanced), std::end(advanced));
|
standard.insert(std::end(standard), std::begin(advanced), std::end(advanced));
|
||||||
standard.insert(std::end(standard), std::begin(developer), std::end(developer));
|
standard.insert(std::end(standard), std::begin(developer), std::end(developer));
|
||||||
|
|
||||||
int dpIndex = 1;
|
int dpIndex = 1;
|
||||||
foreach(auto displayPlugin, standard) {
|
foreach(auto displayPlugin, standard) {
|
||||||
addDisplayPluginToMenu(displayPlugin, dpIndex);
|
addDisplayPluginToMenu(displayPlugin, dpIndex);
|
||||||
dpIndex++;
|
dpIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// after all plugins have been added to the menu, add a separator to the menu
|
// after all plugins have been added to the menu, add a separator to the menu
|
||||||
|
|
Loading…
Reference in a new issue