3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into feature_simulation_ux_tweaks

Browse source 
# Conflicts:
#	plugins/SimulationView/SimulationView.qml
This commit is contained in:
fieldOfView 2017-11-21 16:49:41 +01:00
commit 863b40b900
12 changed files with 33 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/SimulationView/SimulationView.qml
View file

@ -199,6 +199,7 @@ Item
{
layerTypeCombobox.currentIndex = UM.SimulationView.compatibilityMode ? 1 : UM.Preferences.getValue("layerview/layer_view_type");
layerTypeCombobox.updateLegends(layerTypeCombobox.currentIndex);
playButton.pauseSimulation();
viewSettings.extruder_opacities = UM.Preferences.getValue("layerview/extruder_opacities").split("|");
viewSettings.show_travel_moves = UM.Preferences.getValue("layerview/show_travel_moves");
viewSettings.show_helpers = UM.Preferences.getValue("layerview/show_helpers");