diff options
| author | Jelle Spijker <spijker.jelle@gmail.com> | 2022-04-08 11:26:12 +0300 |
|---|---|---|
| committer | Jelle Spijker <spijker.jelle@gmail.com> | 2022-04-08 11:26:12 +0300 |
| commit | 4abdd675f639a6090b3bacd1a20451a5dbaa465e (patch) | |
| tree | 624af33fc4a84d206a8a227d41e12c83a6944367 /cura/Scene | |
| parent | efc5438090ea69366700e884197d3f1b91c830d6 (diff) | |
| parent | 855eaec81ce163351cbcfd08a0274ba0945c534a (diff) | |
Merge branch 'master' into qt6_beyond_the_splash
Diffstat (limited to 'cura/Scene')
| -rw-r--r-- | cura/Scene/ConvexHullDecorator.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index bc4ba3ffd5..b15eaf2ae1 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -383,9 +383,9 @@ class ConvexHullDecorator(SceneNodeDecorator): # Shrinkage compensation. if not self._global_stack: # Should never happen. return convex_hull - scale_factor = self._global_stack.getProperty("material_shrinkage_percentage", "value") / 100.0 + scale_factor = self._global_stack.getProperty("material_shrinkage_percentage_xy", "value") / 100.0 result = convex_hull - if scale_factor != 1.0 and not self.getNode().callDecoration("isGroup"): + if scale_factor != 1.0 and scale_factor > 0 and not self.getNode().callDecoration("isGroup"): center = None if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time": # Find the root node that's placed in the scene; the root of the mesh group. @@ -498,7 +498,7 @@ class ConvexHullDecorator(SceneNodeDecorator): "adhesion_type", "raft_margin", "print_sequence", "skirt_gap", "skirt_line_count", "skirt_brim_line_width", "skirt_distance", "brim_line_count"] - _influencing_settings = {"xy_offset", "xy_offset_layer_0", "mold_enabled", "mold_width", "anti_overhang_mesh", "infill_mesh", "cutting_mesh", "material_shrinkage_percentage"} + _influencing_settings = {"xy_offset", "xy_offset_layer_0", "mold_enabled", "mold_width", "anti_overhang_mesh", "infill_mesh", "cutting_mesh", "material_shrinkage_percentage_xy"} """Settings that change the convex hull. If these settings change, the convex hull should be recalculated. |