Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

This commit is contained in:
Tamara Hogenhout 2015-10-16 12:12:47 +02:00
commit 886083d2eb

View File

@ -256,7 +256,6 @@
"min_value_warning": "0.2", "min_value_warning": "0.2",
"max_value_warning": "5", "max_value_warning": "5",
"type": "float", "type": "float",
"inherit_function": "parent_value",
"visible": false, "visible": false,
"children": { "children": {
"wall_line_count": { "wall_line_count": {
@ -454,7 +453,7 @@
"type": "float", "type": "float",
"default": 2, "default": 2,
"visible": false, "visible": false,
"inherit_function": "0 if parent_value == 0 else (infill_line_width * 100) / parent_value" "inherit_function": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density"
} }
} }
}, },