From 7ff1b937e32869aee32fd81d24043a4e1b2ec654 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 29 Jul 2016 15:19:50 +0200
Subject: [PATCH] Perobject settings now use correct stacks to calculate values

CURA-1754
---
 plugins/CuraEngineBackend/StartSliceJob.py               | 2 +-
 plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index 26cf71ec7e..6e7ccba6ee 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -212,7 +212,7 @@ class StartSliceJob(Job):
     def _handlePerObjectSettings(self, node, message):
         stack = node.callDecoration("getStack")
         # 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.
             for key in stack.getAllKeys():
                 setting = message.addRepeatedMessage("settings")
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index 75cf522c14..482fb73b0f 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -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);
                 onModelChanged: updateCurrentIndex();