diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2017-06-19 12:34:06 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2017-06-19 12:34:06 +0300 |
| commit | 015c253252ffb7235a45e86d060a3c496338656e (patch) | |
| tree | cbf0cfc209c7c88d570e028d1d53397d25dd673c | |
| parent | 17a610a3a6abb1206b86c43bf2ce0c5ade1ffb50 (diff) | |
| parent | 80cb0e5aac5d1a5a4180c788290a15ca4721e333 (diff) | |
Merge branch 'master' of github.com:Ultimaker/Cura
| -rwxr-xr-x | cura/LayerDataBuilder.py | 2 | ||||
| -rwxr-xr-x | plugins/LayerView/LayerPass.py | 6 | ||||
| -rw-r--r-- | resources/definitions/peopoly_moai.def.json | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/cura/LayerDataBuilder.py b/cura/LayerDataBuilder.py index 2051d3a761..a5da57d42b 100755 --- a/cura/LayerDataBuilder.py +++ b/cura/LayerDataBuilder.py @@ -69,7 +69,7 @@ class LayerDataBuilder(MeshBuilder): vertex_offset = 0 index_offset = 0 - for layer, data in self._layers.items(): + for layer, data in sorted(self._layers.items()): ( vertex_offset, index_offset ) = data.build( vertex_offset, index_offset, vertices, colors, line_dimensions, extruders, line_types, indices) self._element_counts[layer] = data.elementCount diff --git a/plugins/LayerView/LayerPass.py b/plugins/LayerView/LayerPass.py index b706f21877..51a35fb48a 100755 --- a/plugins/LayerView/LayerPass.py +++ b/plugins/LayerView/LayerPass.py @@ -82,12 +82,12 @@ class LayerPass(RenderPass): start = 0 end = 0 element_counts = layer_data.getElementCounts() - for layer, counts in element_counts.items(): + for layer in sorted(element_counts.keys()): if layer > self._layer_view._current_layer_num: break if self._layer_view._minimum_layer_num > layer: - start += counts - end += counts + start += element_counts[layer] + end += element_counts[layer] # This uses glDrawRangeElements internally to only draw a certain range of lines. batch = RenderBatch(self._layer_shader, type = RenderBatch.RenderType.Solid, mode = RenderBatch.RenderMode.Lines, range = (start, end)) diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 9c01ca95e4..4bbb033fb7 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -114,6 +114,12 @@ "speed_slowdown_layers": { "value": "2" }, + "infill_overlap": { + "value": "15" + }, + "adhesion_type": { + "value": "\"none\"" + }, "acceleration_enabled": { "value": "False" |