History

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

Andrzej Kapolka committed 12 years ago

Commit e470b1c2 parents 09ad404 224f42c47 files · +2174 −177Browse files

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

Unified · Split

interface/src/Menu.cpp+14−0
@@ -437,6 +437,20 @@ Menu::Menu() : · 436 unmodified lines
437437 appInstance->getVoxels(),
438438 SLOT(trueColorize()));
439439
440+ addCheckableActionToQMenuAndActionHash(renderDebugMenu,
441+ MenuOption::CullSharedFaces,
442+ Qt::CTRL | Qt::SHIFT | Qt::Key_C,
443+ false,
444+ appInstance->getVoxels(),
445+ SLOT(cullSharedFaces()));
446+
447+ addCheckableActionToQMenuAndActionHash(renderDebugMenu,
448+ MenuOption::ShowCulledSharedFaces,
449+ Qt::CTRL | Qt::SHIFT | Qt::Key_X,
450+ false,
451+ appInstance->getVoxels(),
452+ SLOT(showCulledSharedFaces()));
453+
440454 addDisabledActionAndSeparator(renderDebugMenu, "Coverage Maps");
441455 addActionToQMenuAndActionHash(renderDebugMenu,
442456 MenuOption::FalseColorOccluded,