History

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

Thijs Wenker committed 12 years ago

Commit d2d39372 parents b2e969d e4d30c555 files · +1479 −436Browse files

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

Unified · Split

interface/src/Menu.cpp+8−0
@@ -430,6 +430,14 @@ Menu::Menu() : · 429 unmodified lines
430430 Qt::CTRL | Qt::SHIFT | Qt::Key_A,
431431 true);
432432
433+ addCheckableActionToQMenuAndActionHash(spatialAudioMenu, MenuOption::AudioSpatialProcessingDontDistanceAttenuate,
434+ Qt::CTRL | Qt::SHIFT | Qt::Key_Y,
435+ false);
436+
437+ addCheckableActionToQMenuAndActionHash(spatialAudioMenu, MenuOption::AudioSpatialProcessingAlternateDistanceAttenuate,
438+ Qt::CTRL | Qt::SHIFT | Qt::Key_U,
439+ false);
440+
433441 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
434442 Qt::CTRL | Qt::SHIFT | Qt::Key_V,
435443 this,