History

Merge branch 'master' into 20639

David Rowe committed 11 years ago

Commit d7b42e22 parents e8eac7d 12286b7162 files · +2467 −1792Browse files

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

Unified · Split

interface/src/Menu.cpp+3−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 #include "devices/Faceshift.h"
3030 #include "devices/RealSense.h"
3131 #include "devices/SixenseManager.h"
32−#include "devices/3Dconnexion.h"
32+#include "devices/3DConnexionClient.h"
3333 #include "MainWindow.h"
3434 #include "scripting/MenuScriptingInterface.h"
3535 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -421,6 +421,8 @@ Menu::Menu() { · 385 unmodified lines
421421 faceTrackingMenu->addSeparator();
422422 QAction* binaryEyelidControl = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::BinaryEyelidControl, 0, true);
423423 binaryEyelidControl->setVisible(true); // DDE face tracking is on by default
424+ QAction* coupleEyelids = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::CoupleEyelids, 0, true);
425+ coupleEyelids->setVisible(true); // DDE face tracking is on by default
424426 QAction* useAudioForMouth = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseAudioForMouth, 0, true);
425427 useAudioForMouth->setVisible(true); // DDE face tracking is on by default
426428 QAction* ddeFiltering = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::VelocityFilter, 0, true);