From a6707217c7acf8db87fb978eea1ffcd8a3082f80 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Wed, 2 Sep 2020 02:08:18 +0200
Subject: [PATCH] Get scale factor from global stack

This is the one that's actually used by CuraEngine. If I get it per-object, the material profile overrides it.

Contributes to issue CURA-7118.
---
 cura/Scene/ConvexHullDecorator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py
index 9e3e4e1a38..c86612bd71 100644
--- a/cura/Scene/ConvexHullDecorator.py
+++ b/cura/Scene/ConvexHullDecorator.py
@@ -380,7 +380,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
         influences the collision area.
         """
 
-        scale_factor = self._getSettingProperty("material_shrinkage_percentage") / 100.0
+        scale_factor = self._global_stack.getProperty("material_shrinkage_percentage", "value") / 100.0
         center = self.getNode().getBoundingBox().center
         result = convex_hull.scale(scale_factor, [center.x, center.z])  # Yes, use Z instead of Y. Mixed conventions there with how the OpenGL coordinates are transmitted.