History

Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay

More reliable and usable UI sphere overlay location

Philip Rosedale committed 10 years ago

Commit e87ef522 parents 8a36df1 6d11dd46 files · +37 −2Browse files

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

Unified · Split

interface/src/Menu.cpp+2−0
@@ -464,6 +464,8 @@ Menu::Menu() { · 463 unmodified lines
464 avatar, SLOT(setUseAnimPreAndPostRotations(bool)));464 avatar, SLOT(setUseAnimPreAndPostRotations(bool)));
465 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableInverseKinematics, 0, true,465 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableInverseKinematics, 0, true,
466 avatar, SLOT(setEnableInverseKinematics(bool)));466 avatar, SLOT(setEnableInverseKinematics(bool)));
467 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSensorToWorldMatrix, 0, false,
468 avatar, SLOT(setEnableDebugDrawSensorToWorldMatrix(bool)));
467 469
468 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::KeyboardMotorControl,470 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::KeyboardMotorControl,
469 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar, SLOT(updateMotionBehaviorFromMenu()),471 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar, SLOT(updateMotionBehaviorFromMenu()),