diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 76d14b74ab..efc5fe4a76 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2549,11 +2549,12 @@ void Application::init() { setAvatarUpdateThreading(); } +const bool ENABLE_AVATAR_UPDATE_THREADING = false; void Application::setAvatarUpdateThreading() { - setAvatarUpdateThreading(Menu::getInstance()->isOptionChecked(MenuOption::EnableAvatarUpdateThreading)); + setAvatarUpdateThreading(ENABLE_AVATAR_UPDATE_THREADING); } void Application::setRawAvatarUpdateThreading() { - setRawAvatarUpdateThreading(Menu::getInstance()->isOptionChecked(MenuOption::EnableAvatarUpdateThreading)); + setRawAvatarUpdateThreading(ENABLE_AVATAR_UPDATE_THREADING); } void Application::setRawAvatarUpdateThreading(bool isThreaded) { if (_avatarUpdate) { diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 3f472a5b09..d0c8b502c5 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -441,8 +441,6 @@ Menu::Menu() { addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false); addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false); addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false); - addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableAvatarUpdateThreading, 0, false, - qApp, SLOT(setAvatarUpdateThreading(bool))); addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawDefaultPose, 0, false, avatar, SLOT(setEnableDebugDrawDefaultPose(bool))); addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawAnimPose, 0, false, diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 01164d9c0c..6b51987479 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -189,10 +189,7 @@ namespace MenuOption { const QString EchoServerAudio = "Echo Server Audio"; const QString EditEntitiesHelp = "Edit Entities Help..."; const QString Enable3DTVMode = "Enable 3DTV Mode"; - const QString EnableAvatarUpdateThreading = "Enable Avatar Update Threading"; - const QString EnableAnimGraph = "Enable Anim Graph"; const QString EnableCharacterController = "Enable avatar collisions"; - const QString EnableRigAnimations = "Enable Rig Animations"; const QString ExpandMyAvatarSimulateTiming = "Expand /myAvatar/simulation"; const QString ExpandMyAvatarTiming = "Expand /myAvatar"; const QString ExpandOtherAvatarTiming = "Expand /otherAvatar";