History

Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter

Dante Ruiz committed 9 years ago

Commit 54d63f52 parents ffcc3c8 a7b9fbb83 files · +935 −621Browse files

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

Unified · Split

interface/src/Menu.cpp+2−0
@@ -525,6 +525,8 @@ Menu::Menu() { · 524 unmodified lines
525 avatar.get(), SLOT(setEnableDebugDrawIKTargets(bool)));525 avatar.get(), SLOT(setEnableDebugDrawIKTargets(bool)));
526 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderIKConstraints, 0, false,526 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderIKConstraints, 0, false,
527 avatar.get(), SLOT(setEnableDebugDrawIKConstraints(bool)));527 avatar.get(), SLOT(setEnableDebugDrawIKConstraints(bool)));
528 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderIKChains, 0, false,
529 avatar.get(), SLOT(setEnableDebugDrawIKChains(bool)));
528 530
529 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ActionMotorControl,531 addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ActionMotorControl,
530 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar.get(), SLOT(updateMotionBehaviorFromMenu()),532 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar.get(), SLOT(updateMotionBehaviorFromMenu()),