3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into feature_mesh_types

Browse source 
# Conflicts:
#	plugins/SolidView/SolidView.py
This commit is contained in:
fieldOfView 2017-11-18 11:28:15 +01:00
commit 1924946b59
63 changed files with 5629 additions and 1042 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/Settings/SettingOverrideDecorator.py
View file

@ -35,11 +35,7 @@ class SettingOverrideDecorator(SceneNodeDecorator):
self._stack = PerObjectContainerStack(stack_id = id(self))
self._stack.setDirty(False) # This stack does not need to be saved.
self._stack.addContainer(InstanceContainer(container_id = "SettingOverrideInstanceContainer"))
if ExtruderManager.getInstance().extruderCount > 1:
self._extruder_stack = ExtruderManager.getInstance().getExtruderStack(0).getId()
else:
self._extruder_stack = None
self._extruder_stack = ExtruderManager.getInstance().getExtruderStack(0).getId()
self._stack.propertyChanged.connect(self._onSettingChanged)