History

Merge branch 'master' into tony/remove-joint-states

Anthony J. Thibault committed 11 years ago

Commit b481d7c2 parents 9a39da9 9c29ba2115 files · +3191 −1167Browse files

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

Unified · Split

interface/src/Menu.cpp+3−0
@@ -266,6 +266,9 @@ Menu::Menu() { · 265 unmodified lines
266266 cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu,
267267 MenuOption::IndependentMode, 0,
268268 false, qApp, SLOT(cameraMenuChanged())));
269+ cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu,
270+ MenuOption::CameraEntityMode, 0,
271+ false, qApp, SLOT(cameraMenuChanged())));
269272 cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu,
270273 MenuOption::FullscreenMirror, 0, // QML Qt::Key_H,
271274 false, qApp, SLOT(cameraMenuChanged())));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t