Merge branch 'master' of git://github.com/worklist/hifi

This commit is contained in:
atlante45 2013-07-09 17:12:13 +02:00
commit 0171803bc8

View file

@ -1512,7 +1512,7 @@ void Application::initMenu() {
QMenu* renderMenu = menuBar->addMenu("Render");
(_renderVoxels = renderMenu->addAction("Voxels"))->setCheckable(true);
_renderVoxels->setChecked(true);
_renderVoxels->setShortcut(Qt::CTRL | Qt::Key_V);
_renderVoxels->setShortcut(Qt::SHIFT | Qt::Key_V);
(_renderVoxelTextures = renderMenu->addAction("Voxel Textures"))->setCheckable(true);
(_renderStarsOn = renderMenu->addAction("Stars"))->setCheckable(true);
_renderStarsOn->setChecked(true);