diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2018-09-06 09:10:53 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2018-09-06 09:12:55 +0300 |
| commit | 9aea0e5109fa004402683001721233cb1325d0b7 (patch) | |
| tree | f52c41655f58dcfc71014257a45962667b4f267d /resources/definitions | |
| parent | d3356cdba6bc07e0b8231149f86f237d8f522629 (diff) | |
Fix quality lookup logic for extruders
CURA-5694
- Add convenience functions into GlobalStack
- Use "has_variants" and "has_materials" instead of
"has_variant_materials"
- Remove "has_variant_materials"
- For extruder qualities, skip global qualities if the machine has
variants or materials
Diffstat (limited to 'resources/definitions')
| -rw-r--r-- | resources/definitions/cartesio.def.json | 1 | ||||
| -rw-r--r-- | resources/definitions/ultimaker3.def.json | 1 | ||||
| -rw-r--r-- | resources/definitions/ultimaker3_extended.def.json | 1 | ||||
| -rw-r--r-- | resources/definitions/ultimaker_s5.def.json | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 57c16241a0..9c7a95cceb 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -11,7 +11,6 @@ "has_machine_quality": true, "has_materials": true, "has_machine_materials": true, - "has_variant_materials": true, "has_variants": true, "variants_name": "Tool", diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index b75d12ce44..b1daa6b780 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -13,7 +13,6 @@ "has_machine_quality": true, "has_materials": true, "has_machine_materials": true, - "has_variant_materials": true, "has_variants": true, "preferred_variant_name": "AA 0.4", "preferred_quality_type": "normal", diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 1e6c322c73..eb3cda9320 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -13,7 +13,6 @@ "platform_offset": [0, 0, 0], "has_machine_quality": true, "has_machine_materials": true, - "has_variant_materials": true, "has_materials": true, "has_variants": true, "preferred_variant_name": "AA 0.4", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index f6971d0da3..115c84c0db 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -15,7 +15,6 @@ "has_machine_quality": true, "has_materials": true, "has_machine_materials": true, - "has_variant_materials": true, "has_variant_buildplates": true, "has_variants": true, "preferred_variant_name": "AA 0.4", |