mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Fixed conflicts after merge with master
This commit is contained in:
commit
ac4d9ea172
86 changed files with 3385 additions and 2422 deletions
|
@ -144,9 +144,7 @@ void KBShortcutsDialog::fill_shortcuts()
|
|||
{ ctrl + "J", L("Print host upload queue") },
|
||||
// View
|
||||
{ "0-6", L("Camera view") },
|
||||
#if ENABLE_SHOW_SCENE_LABELS
|
||||
{ "E", L("Show/Hide object/instance labels") },
|
||||
#endif // ENABLE_SHOW_SCENE_LABELS
|
||||
#if ENABLE_SLOPE_RENDERING
|
||||
{ "D", L("Turn On/Off facets' slope rendering") },
|
||||
#endif // ENABLE_SLOPE_RENDERING
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue