History

Merge pull request #3078 from PhilipRosedale/master

Improved toy ball, JS calls for palm position, concertCamera.js

Clément Brisset committed 12 years ago

Commit 463ac9c2 parents cd53b72 64c89df17 files · +469 −50Browse files

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

Unified · Split

interface/src/Menu.cpp+1−0
@@ -346,6 +346,7 @@ Menu::Menu() : · 345 unmodified lines
346 346
347 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Metavoxels, 0, true);347 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Metavoxels, 0, true);
348 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::BuckyBalls, 0, false);348 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::BuckyBalls, 0, false);
349 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::StringHair, 0, false);
349 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Particles, 0, true);350 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Particles, 0, true);
350 addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools()));351 addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools()));
351 352