From f65b636a09c2583eb922eb11772d10af82101909 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Sun, 7 Aug 2016 23:22:30 -0700 Subject: [PATCH] Re-disable HMD preview on OSX --- .../src/display-plugins/hmd/HmdDisplayPlugin.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index b1e761ab69..9d7a497d27 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -38,7 +38,9 @@ static const QString DISABLE_PREVIEW = "Disable Preview"; static const QString FRAMERATE = DisplayPlugin::MENU_PATH() + ">Framerate"; static const QString DEVELOPER_MENU_PATH = "Developer>" + DisplayPlugin::MENU_PATH(); static const bool DEFAULT_MONO_VIEW = true; +#if !defined(Q_OS_MAC) static const bool DEFAULT_DISABLE_PREVIEW = false; +#endif static const glm::mat4 IDENTITY_MATRIX; static const size_t NUMBER_OF_HANDS = 2; @@ -69,7 +71,9 @@ bool HmdDisplayPlugin::internalActivate() { _monoPreview = clicked; _container->setBoolSetting("monoPreview", _monoPreview); }, true, _monoPreview); - +#if defined(Q_OS_MAC) + _disablePreview = true; +#else _disablePreview = _container->getBoolSetting("disableHmdPreview", DEFAULT_DISABLE_PREVIEW || !_vsyncSupported); if (_vsyncSupported) { _container->addMenuItem(PluginType::DISPLAY_PLUGIN, MENU_PATH(), DISABLE_PREVIEW, @@ -81,6 +85,7 @@ bool HmdDisplayPlugin::internalActivate() { } }, true, _disablePreview); } +#endif _container->removeMenu(FRAMERATE); for_each_eye([&](Eye eye) {