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

Sam Cake committed 11 years ago

Commit 04d3f692 parents 536fff4 349886c42 files · +1682 −937Browse files

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

Unified · Split

interface/src/Application.cpp+1−0

@@ -1949,6 +1949,7 @@ void Application::setActiveFaceTracker() { · 1948 unmodified lines
1949	#endif	1949	#endif
1950	#ifdef HAVE_DDE	1950	#ifdef HAVE_DDE
1951	bool isUsingDDE = Menu::getInstance()->isOptionChecked(MenuOption::UseCamera);	1951	bool isUsingDDE = Menu::getInstance()->isOptionChecked(MenuOption::UseCamera);
		1952	Menu::getInstance()->getActionForOption(MenuOption::BinaryEyelidControl)->setVisible(isUsingDDE);
1952	Menu::getInstance()->getActionForOption(MenuOption::UseAudioForMouth)->setVisible(isUsingDDE);	1953	Menu::getInstance()->getActionForOption(MenuOption::UseAudioForMouth)->setVisible(isUsingDDE);
1953	Menu::getInstance()->getActionForOption(MenuOption::VelocityFilter)->setVisible(isUsingDDE);	1954	Menu::getInstance()->getActionForOption(MenuOption::VelocityFilter)->setVisible(isUsingDDE);
1954	Menu::getInstance()->getActionForOption(MenuOption::CalibrateCamera)->setVisible(isUsingDDE);	1955	Menu::getInstance()->getActionForOption(MenuOption::CalibrateCamera)->setVisible(isUsingDDE);