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
29#include "devices/Faceshift.h"29#include "devices/Faceshift.h"
30#include "devices/RealSense.h"30#include "devices/RealSense.h"
31#include "devices/SixenseManager.h"31#include "devices/SixenseManager.h"
32#include "devices/3Dconnexion.h"32#include "devices/3DConnexionClient.h"
33#include "MainWindow.h"33#include "MainWindow.h"
34#include "scripting/MenuScriptingInterface.h"34#include "scripting/MenuScriptingInterface.h"
35#if defined(Q_OS_MAC) || defined(Q_OS_WIN)35#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -421,6 +421,8 @@ Menu::Menu() { · 385 unmodified lines
421 faceTrackingMenu->addSeparator();421 faceTrackingMenu->addSeparator();
422 QAction* binaryEyelidControl = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::BinaryEyelidControl, 0, true);422 QAction* binaryEyelidControl = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::BinaryEyelidControl, 0, true);
423 binaryEyelidControl->setVisible(true); // DDE face tracking is on by default423 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
424 QAction* useAudioForMouth = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseAudioForMouth, 0, true);426 QAction* useAudioForMouth = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseAudioForMouth, 0, true);
425 useAudioForMouth->setVisible(true); // DDE face tracking is on by default427 useAudioForMouth->setVisible(true); // DDE face tracking is on by default
426 QAction* ddeFiltering = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::VelocityFilter, 0, true);428 QAction* ddeFiltering = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::VelocityFilter, 0, true);