History

Merge remote-tracking branch 'upstream/master' into android

Brad Davis committed 8 years ago

Commit 6a06bf42 parents b422321 d4571bd188 files · +1191 −774Browse files

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

Unified · Split

interface/src/Application.cpp+9−7
@@ -5534,7 +5534,7 @@ void Application::clearDomainOctreeDetails() { · 5533 unmodified lines
5534 5534
5535 auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();5535 auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
5536 5536
5537 skyStage->setBackgroundMode(model::SunSkyStage::SKY_DEFAULT);5537 skyStage->setBackgroundMode(graphics::SunSkyStage::SKY_DEFAULT);
5538 5538
5539 DependencyManager::get<AnimationCache>()->clearUnusedResources();5539 DependencyManager::get<AnimationCache>()->clearUnusedResources();
5540 DependencyManager::get<ModelCache>()->clearUnusedResources();5540 DependencyManager::get<ModelCache>()->clearUnusedResources();
@@ -6249,7 +6249,7 @@ void Application::showAssetServerWidget(QString filePath) { · 708 unmodified lines
6249 if (!hmd->getShouldShowTablet() && !isHMDMode()) {6249 if (!hmd->getShouldShowTablet() && !isHMDMode()) {
6250 DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload);6250 DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload);
6251 } else {6251 } else {
6252 static const QUrl url("hifi/dialogs/TabletAssetServer.qml");6252 static const QUrl url("../dialogs/TabletAssetServer.qml");
6253 tablet->pushOntoStack(url);6253 tablet->pushOntoStack(url);
6254 }6254 }
6255 }6255 }
@@ -7469,11 +7469,13 @@ void Application::updateThreadPoolCount() const { · 1213 unmodified lines
7469}7469}
7470 7470
7471void Application::updateSystemTabletMode() {7471void Application::updateSystemTabletMode() {
7472 qApp->setProperty(hifi::properties::HMD, isHMDMode());7472 if (_settingsLoaded) {
7473 if (isHMDMode()) {7473 qApp->setProperty(hifi::properties::HMD, isHMDMode());
7474 DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());7474 if (isHMDMode()) {
7475 } else {7475 DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
7476 DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());7476 } else {
7477 DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
7478 }
7477 }7479 }
7478}7480}
7479 7481