Merge branch 'master' into plugins

Bradley Austin Davis committed 11 years ago

Commit 7e60aee2 parents d415ee1 9215ea8181 files · +5728 −48029Browse files

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

Unified · Split

interface/src/Menu.cpp+2−0

@@ -414,6 +414,8 @@ Menu::Menu() { · 413 unmodified lines
414	414	faceTrackingMenu->addSeparator();
415	415	QAction* binaryEyelidControl = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::BinaryEyelidControl, 0, true);
416	416	binaryEyelidControl->setVisible(true); // DDE face tracking is on by default
	417	+ QAction* coupleEyelids = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::CoupleEyelids, 0, true);
	418	+ coupleEyelids->setVisible(true); // DDE face tracking is on by default
417	419	QAction* useAudioForMouth = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseAudioForMouth, 0, true);
418	420	useAudioForMouth->setVisible(true); // DDE face tracking is on by default
419	421	QAction* ddeFiltering = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::VelocityFilter, 0, true);