History

Merge branch 'master' into feature/ik-solver-init-config

Anthony J. Thibault committed 9 years ago

Commit 93b8dc52 parents e63dc52 35745a058 files · +2198 −521Browse files

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

Unified · Split

interface/src/Menu.cpp+1−1
@@ -197,7 +197,7 @@ Menu::Menu() { · 196 unmodified lines
197197 0, // QML Qt::Key_Apostrophe,
198198 qApp, SLOT(resetSensors()));
199199
200− addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableCharacterController, 0, true,
200+ addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableAvatarCollisions, 0, true,
201201 avatar.get(), SLOT(updateMotionBehaviorFromMenu()));
202202
203203 // Avatar > AvatarBookmarks related menus -- Note: the AvatarBookmarks class adds its own submenus here.