Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations

Stephen Birarda committed 12 years ago

Commit 1007f522 parents 65a557b 473394581 files · +2213 −2146Browse files

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

Unified · Split

interface/src/Menu.cpp+0−1

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