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

Fixed compatibility mode active extruder. CURA-3321

Browse source
This commit is contained in:
U-ULTIMAKER\j.ha 2017-03-02 13:15:29 +01:00
parent d372e73eda
commit c54d5ce707
5 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/LayerDataBuilder.py Normal file → Executable file
View file

@ -63,7 +63,7 @@ class LayerDataBuilder(MeshBuilder):
line_dimensions = numpy.empty((vertex_count, 2), numpy.float32) line_dimensions = numpy.empty((vertex_count, 2), numpy.float32)
colors = numpy.empty((vertex_count, 4), numpy.float32) colors = numpy.empty((vertex_count, 4), numpy.float32)
indices = numpy.empty((index_count, 2), numpy.int32) 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) line_types = numpy.empty((vertex_count), numpy.float32)
vertex_offset = 0 vertex_offset = 0

1
plugins/CuraEngineBackend/CuraEngineBackend.py Normal file → Executable file
View file

@ -517,7 +517,6 @@ class CuraEngineBackend(QObject, Backend):
# \param tool The tool that the user was using. # \param tool The tool that the user was using.
def _onToolOperationStopped(self, tool): def _onToolOperationStopped(self, tool):
self._tool_active = False # React on scene change again self._tool_active = False # React on scene change again
self.determineAutoSlicing()
# Process all the postponed scene changes # Process all the postponed scene changes
while self._postponed_scene_change_sources: while self._postponed_scene_change_sources:
source = self._postponed_scene_change_sources.pop(0) source = self._postponed_scene_change_sources.pop(0)

0
plugins/LayerView/LayerPass.py Normal file → Executable file
View file

0
plugins/LayerView/layers.shader Normal file → Executable file
View file

4
plugins/LayerView/layers3d.shader Normal file → Executable file
View file

@ -16,7 +16,7 @@ vertex41core =
in lowp vec4 a_material_color; in lowp vec4 a_material_color;
in highp vec4 a_normal; in highp vec4 a_normal;
in highp vec2 a_line_dim; // line width and thickness 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; in highp float a_line_type;
out lowp vec4 v_color; out lowp vec4 v_color;
@ -53,7 +53,7 @@ vertex41core =
v_vertex = world_space_vert.xyz; v_vertex = world_space_vert.xyz;
v_normal = (u_normalMatrix * normalize(a_normal)).xyz; v_normal = (u_normalMatrix * normalize(a_normal)).xyz;
v_line_dim = a_line_dim; v_line_dim = a_line_dim;
v_extruder = a_extruder; v_extruder = int(a_extruder);
v_line_type = a_line_type; v_line_type = a_line_type;
v_extruder_opacity = u_extruder_opacity; v_extruder_opacity = u_extruder_opacity;