Merge branch 'master' of https://github.com/highfidelity/hifi into protocol

Stephen Birarda committed 11 years ago

Commit 25aeda22 parents b2778bf 670c5ee30 files · +1684 −102Browse files

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

Unified · Split

interface/src/Menu.cpp+1−1

@@ -447,7 +447,7 @@ Menu::Menu() { · 446 unmodified lines
447	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false);	447	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false);
448	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false);	448	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false);
449	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);	449	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);
450	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableRigAnimations, 0, false,	450	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableRigAnimations, 0, true,
451	avatar, SLOT(setEnableRigAnimations(bool)));	451	avatar, SLOT(setEnableRigAnimations(bool)));
452	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableAnimGraph, 0, false,	452	addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableAnimGraph, 0, false,
453	avatar, SLOT(setEnableAnimGraph(bool)));	453	avatar, SLOT(setEnableAnimGraph(bool)));