From 5d136a1da71b6ab76aac2153ce7a92fc5a3d3495 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Fri, 29 Jan 2016 15:18:19 +0100
Subject: [PATCH] ActiveTool.properties now returns a ContainerProxy object

---
 plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 6 +++---
 resources/qml/Cura.qml                                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index 442b664b43..618937b09c 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -47,7 +47,7 @@ Item {
 
             options: UM.ProfilesModel { addUseGlobal: true }
 
-            value: UM.ActiveTool.properties.Model.getItem(base.currentIndex).profile
+            value: UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex).profile
 
             onItemValueChanged: {
                 var item = UM.ActiveTool.properties.Model.getItem(base.currentIndex);
@@ -63,7 +63,7 @@ Item {
             Repeater {
                 id: settings;
 
-                model: UM.ActiveTool.properties.Model.getItem(base.currentIndex).settings
+                model: UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex).settings
 
                 UM.SettingItem {
                     width: UM.Theme.sizes.setting.width;
@@ -91,7 +91,7 @@ Item {
                         width: UM.Theme.sizes.setting.height;
                         height: UM.Theme.sizes.setting.height;
 
-                        onClicked: UM.ActiveTool.properties.Model.removeSettingOverride(UM.ActiveTool.properties.Model.getItem(base.currentIndex).id, model.key)
+                        onClicked: UM.ActiveTool.properties.getValue("Model").removeSettingOverride(UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex).id, model.key)
 
                         style: ButtonStyle
                         {
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index f3ea4b1289..5d676fdd91 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -464,7 +464,7 @@ UM.MainWindow
                 height: childrenRect.height;
                 Label
                 {
-                    text: UM.ActiveTool.properties.Rotation != undefined ? "%1°".arg(UM.ActiveTool.properties.Rotation) : "";
+                    text: UM.ActiveTool.properties.getValue("Rotation") != undefined ? "%1°".arg(UM.ActiveTool.properties.Rotation) : "";
                 }
 
                 visible: UM.ActiveTool.valid && UM.ActiveTool.properties.Rotation != undefined;