History

correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't

ZappoMan committed 12 years ago

Commit 37ca6ef1 parent bc60c8b15 files · +62 −40Browse files

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

Unified · Split

interface/src/Menu.cpp+4−1
@@ -291,7 +291,6 @@ Menu::Menu() : · 290 unmodified lines
291291 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Metavoxels, 0, true);
292292 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::BuckyBalls, 0, false);
293293 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Particles, 0, true);
294− addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Models, 0, true);
295294 addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools()));
296295
297296 QMenu* voxelOptionsMenu = developerMenu->addMenu("Voxel Options");
@@ -308,6 +307,10 @@ Menu::Menu() : · 10 unmodified lines
308307 addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::DontFadeOnVoxelServerChanges);
309308 addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::DisableAutoAdjustLOD);
310309
310+ QMenu* modelOptionsMenu = developerMenu->addMenu("Model Options");
311+ addCheckableActionToQMenuAndActionHash(modelOptionsMenu, MenuOption::Models, 0, true);
312+ addCheckableActionToQMenuAndActionHash(modelOptionsMenu, MenuOption::DisplayModelProxies, 0, false);
313+
311314 QMenu* avatarOptionsMenu = developerMenu->addMenu("Avatar Options");
312315
313316 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Avatars, 0, true);

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