Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhostkeeper <rubend@tutanota.com>2020-09-02 03:08:18 +0300
committerGhostkeeper <rubend@tutanota.com>2020-09-02 03:08:18 +0300
commita6707217c7acf8db87fb978eea1ffcd8a3082f80 (patch)
tree4248dfd3612ab49211535300775eee26a82b8964 /cura/Scene
parent4e283b5a78a8baac7239e5cbfc9ec5e24f523f62 (diff)
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.
Diffstat (limited to 'cura/Scene')
-rw-r--r--cura/Scene/ConvexHullDecorator.py2
1 files changed, 1 insertions, 1 deletions
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.