diff --git a/cura/LayerDataBuilder.py b/cura/LayerDataBuilder.py old mode 100644 new mode 100755 index 7cb6f75df3..df4b9e3218 --- a/cura/LayerDataBuilder.py +++ b/cura/LayerDataBuilder.py @@ -63,7 +63,7 @@ class LayerDataBuilder(MeshBuilder): line_dimensions = numpy.empty((vertex_count, 2), numpy.float32) colors = numpy.empty((vertex_count, 4), numpy.float32) indices = numpy.empty((index_count, 2), numpy.int32) - extruders = numpy.empty((vertex_count), numpy.int32) # Only usable for newer OpenGL versions + extruders = numpy.empty((vertex_count), numpy.float32) line_types = numpy.empty((vertex_count), numpy.float32) vertex_offset = 0 diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py old mode 100644 new mode 100755 index ab6e0a08a5..3aa226c518 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -517,7 +517,6 @@ class CuraEngineBackend(QObject, Backend): # \param tool The tool that the user was using. def _onToolOperationStopped(self, tool): self._tool_active = False # React on scene change again - self.determineAutoSlicing() # Process all the postponed scene changes while self._postponed_scene_change_sources: source = self._postponed_scene_change_sources.pop(0) diff --git a/plugins/LayerView/LayerPass.py b/plugins/LayerView/LayerPass.py old mode 100644 new mode 100755 diff --git a/plugins/LayerView/layers.shader b/plugins/LayerView/layers.shader old mode 100644 new mode 100755 diff --git a/plugins/LayerView/layers3d.shader b/plugins/LayerView/layers3d.shader old mode 100644 new mode 100755 index 5bc6066152..2108d85eb2 --- a/plugins/LayerView/layers3d.shader +++ b/plugins/LayerView/layers3d.shader @@ -16,7 +16,7 @@ vertex41core = in lowp vec4 a_material_color; in highp vec4 a_normal; in highp vec2 a_line_dim; // line width and thickness - in highp int a_extruder; // Note: cannot use this in compatibility, int is only available in newer OpenGL. + in highp float a_extruder; in highp float a_line_type; out lowp vec4 v_color; @@ -53,7 +53,7 @@ vertex41core = v_vertex = world_space_vert.xyz; v_normal = (u_normalMatrix * normalize(a_normal)).xyz; v_line_dim = a_line_dim; - v_extruder = a_extruder; + v_extruder = int(a_extruder); v_line_type = a_line_type; v_extruder_opacity = u_extruder_opacity;