History

Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui

Seth Alves committed 9 years ago

Commit b50a02e2 parents fa0e2a6 83aa73534 files · +164 −76Browse files

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

Unified · Split

interface/src/Menu.cpp+2−0
@@ -515,6 +515,8 @@ Menu::Menu() { · 514 unmodified lines
515 avatar.get(), SLOT(setEnableInverseKinematics(bool)));515 avatar.get(), SLOT(setEnableInverseKinematics(bool)));
516 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSensorToWorldMatrix, 0, false,516 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSensorToWorldMatrix, 0, false,
517 avatar.get(), SLOT(setEnableDebugDrawSensorToWorldMatrix(bool)));517 avatar.get(), SLOT(setEnableDebugDrawSensorToWorldMatrix(bool)));
518 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderIKTargets, 0, false,
519 avatar.get(), SLOT(setEnableDebugDrawIKTargets(bool)));
518 520
519 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ActionMotorControl,521 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ActionMotorControl,
520 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar.get(), SLOT(updateMotionBehaviorFromMenu()),522 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar.get(), SLOT(updateMotionBehaviorFromMenu()),