3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.8'

Browse source
This commit is contained in:
Ghostkeeper 2020-11-09 14:48:57 +01:00
commit 68422e8be4
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
29 changed files with 1233 additions and 2034 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
View file

@ -103,17 +103,20 @@ class PerObjectSettingsTool(Tool):
new_instance.resetState() # Ensure that the state is not seen as a user state.
settings.addInstance(new_instance)
for property_key in ["top_bottom_thickness", "wall_thickness"]:
for property_key in ["top_bottom_thickness", "wall_thickness", "wall_line_count"]:
if mesh_type == "infill_mesh":
if settings.getInstance(property_key) is None:
definition = stack.getSettingDefinition(property_key)
new_instance = SettingInstance(definition, settings)
new_instance.setProperty("value", 0)
# We just want the wall_line count to be there in case it was overriden in the global stack.
# as such, we don't need to set a value.
if property_key != "wall_line_count":
new_instance.setProperty("value", 0)
new_instance.resetState() # Ensure that the state is not seen as a user state.
settings.addInstance(new_instance)
settings_visibility_changed = True
elif old_mesh_type == "infill_mesh" and settings.getInstance(property_key) and settings.getProperty(property_key, "value") == 0:
elif old_mesh_type == "infill_mesh" and settings.getInstance(property_key) and (settings.getProperty(property_key, "value") == 0 or property_key == "wall_line_count"):
settings.removeInstance(property_key)
settings_visibility_changed = True