diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2022-03-22 17:23:32 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2022-03-22 17:23:32 +0300 |
| commit | fa1554a62e325b4774a1c45548f1f15e3de4def4 (patch) | |
| tree | d46790940c555b9745b0f9baf9bea0387312659c /cura | |
| parent | 10b37472878a527477f0d3486a13834a86fe7017 (diff) | |
| parent | a8f979c204ec0051228b71295c9a364d7e022465 (diff) | |
Merge branch 'fix_disallowed_brim_gap_distance' of github.com:Ultimaker/Cura
Diffstat (limited to 'cura')
| -rwxr-xr-x | cura/BuildVolume.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index d039a3c68f..fa230866e9 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -1113,7 +1113,8 @@ class BuildVolume(SceneNode): # Use brim width if brim is enabled OR the prime tower has a brim. if adhesion_type == "brim": brim_line_count = skirt_brim_stack.getProperty("brim_line_count", "value") - bed_adhesion_size = skirt_brim_line_width * brim_line_count * initial_layer_line_width_factor / 100.0 + brim_gap = skirt_brim_stack.getProperty("brim_gap", "value") + bed_adhesion_size = brim_gap + skirt_brim_line_width * brim_line_count * initial_layer_line_width_factor / 100.0 for extruder_stack in used_extruders: bed_adhesion_size += extruder_stack.getProperty("skirt_brim_line_width", "value") * extruder_stack.getProperty("initial_layer_line_width_factor", "value") / 100.0 @@ -1214,7 +1215,7 @@ class BuildVolume(SceneNode): return max(min(value, max_value), min_value) _machine_settings = ["machine_width", "machine_depth", "machine_height", "machine_shape", "machine_center_is_zero"] - _skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_brim_line_width", "brim_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "initial_layer_line_width_factor"] + _skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_brim_line_width", "brim_gap", "brim_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "initial_layer_line_width_factor"] _raft_settings = ["adhesion_type", "raft_base_thickness", "raft_interface_layers", "raft_interface_thickness", "raft_surface_layers", "raft_surface_thickness", "raft_airgap", "layer_0_z_overlap"] _extra_z_settings = ["retraction_hop_enabled", "retraction_hop"] _prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "prime_blob_enable"] |