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

stojce committed 12 years ago

Commit cc83c2b2 parents 466dbdc 034870e91 files · +2402 −2426Browse files

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

Unified · Split

interface/src/Menu.cpp+0−1

@@ -367,7 +367,6 @@ Menu::Menu() : · 366 unmodified lines
367	shadowGroup->addAction(addCheckableActionToQMenuAndActionHash(shadowMenu, "None", 0, true));	367	shadowGroup->addAction(addCheckableActionToQMenuAndActionHash(shadowMenu, "None", 0, true));
368	shadowGroup->addAction(addCheckableActionToQMenuAndActionHash(shadowMenu, MenuOption::SimpleShadows, 0, false));	368	shadowGroup->addAction(addCheckableActionToQMenuAndActionHash(shadowMenu, MenuOption::SimpleShadows, 0, false));
369	shadowGroup->addAction(addCheckableActionToQMenuAndActionHash(shadowMenu, MenuOption::CascadedShadows, 0, false));	369	shadowGroup->addAction(addCheckableActionToQMenuAndActionHash(shadowMenu, MenuOption::CascadedShadows, 0, false));
370	addCheckableActionToQMenuAndActionHash(shadowMenu, MenuOption::AvatarsReceiveShadows, 0, true);
371		370
372		371
373	addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, Qt::Key_Asterisk, true);	372	addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, Qt::Key_Asterisk, true);