merge upstream/master into andrew/ragdoll

Andrew Meadows committed 12 years ago

Commit 8359e672 parents cefe8e0 fe9ae5b57 files · +1332 −509Browse files

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

Unified · Split

interface/src/Menu.cpp+2−2

@@ -332,9 +332,9 @@ Menu::Menu() : · 331 unmodified lines
332	addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersVoxelNodes,	332	addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersVoxelNodes,
333	Qt::CTRL \| Qt::SHIFT \| Qt::Key_1, false,	333	Qt::CTRL \| Qt::SHIFT \| Qt::Key_1, false,
334	&nodeBounds, SLOT(setShowVoxelNodes(bool)));	334	&nodeBounds, SLOT(setShowVoxelNodes(bool)));
335	addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersModelNodes,	335	addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersEntityNodes,
336	Qt::CTRL \| Qt::SHIFT \| Qt::Key_2, false,	336	Qt::CTRL \| Qt::SHIFT \| Qt::Key_2, false,
337	&nodeBounds, SLOT(setShowModelNodes(bool)));	337	&nodeBounds, SLOT(setShowEntityNodes(bool)));
338	addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersParticleNodes,	338	addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersParticleNodes,
339	Qt::CTRL \| Qt::SHIFT \| Qt::Key_3, false,	339	Qt::CTRL \| Qt::SHIFT \| Qt::Key_3, false,
340	&nodeBounds, SLOT(setShowParticleNodes(bool)));	340	&nodeBounds, SLOT(setShowParticleNodes(bool)));