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

Perobject settings now use correct stacks to calculate values

Browse source 
CURA-1754
This commit is contained in:
Jaime van Kessel 2016-07-29 15:19:50 +02:00
parent 6f46ed35fc
commit 7ff1b937e3
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -212,7 +212,7 @@ class StartSliceJob(Job):
def _handlePerObjectSettings(self, node, message): def _handlePerObjectSettings(self, node, message):
stack = node.callDecoration("getStack") stack = node.callDecoration("getStack")
# Check if the node has a stack attached to it and the stack has any settings in the top container. # Check if the node has a stack attached to it and the stack has any settings in the top container.
if stack and stack.getTop().getAllKeys(): if stack:
# Because we want to use inheritance correctly, we send all settings as seen from the per object stack. # Because we want to use inheritance correctly, we send all settings as seen from the per object stack.
for key in stack.getAllKeys(): for key in stack.getAllKeys():
setting = message.addRepeatedMessage("settings") setting = message.addRepeatedMessage("settings")

6
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -127,7 +127,11 @@ Item {
} }
} }
} }
Component.onCompleted:
{
// Ensure primary extruder is set as active
UM.ActiveTool.setProperty("SelectedActiveExtruder", extruders_model.getItem(0).id)
}
onActivated: UM.ActiveTool.setProperty("SelectedActiveExtruder", extruders_model.getItem(index).id); onActivated: UM.ActiveTool.setProperty("SelectedActiveExtruder", extruders_model.getItem(index).id);
onModelChanged: updateCurrentIndex(); onModelChanged: updateCurrentIndex();