3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

A hotfix for #2179 (GCode preview crash on T-1 in GCode)

Browse source
This commit is contained in:
Lukas Matena 2019-04-29 11:13:32 +02:00
parent 9d67804d10
commit 3ec17fae67
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -5001,6 +5001,10 @@ bool GLCanvas3D::_travel_paths_by_tool(const GCodePreviewData& preview_data, con
// creates a new volume for each tool // creates a new volume for each tool
for (Tool& tool : tools) for (Tool& tool : tools)
{ {
// tool.value could be invalid (as it was with https://github.com/prusa3d/Slic3r/issues/2179), we better check
if (tool.value >= tool_colors.size())
continue;
GLVolume* volume = new GLVolume(tool_colors.data() + tool.value * 4); GLVolume* volume = new GLVolume(tool_colors.data() + tool.value * 4);
if (volume == nullptr) if (volume == nullptr)
return false; return false;
@ -5015,7 +5019,7 @@ bool GLCanvas3D::_travel_paths_by_tool(const GCodePreviewData& preview_data, con
for (const GCodePreviewData::Travel::Polyline& polyline : preview_data.travel.polylines) for (const GCodePreviewData::Travel::Polyline& polyline : preview_data.travel.polylines)
{ {
ToolsList::iterator tool = std::find(tools.begin(), tools.end(), Tool(polyline.extruder_id)); ToolsList::iterator tool = std::find(tools.begin(), tools.end(), Tool(polyline.extruder_id));
if (tool != tools.end()) if (tool != tools.end() && tool->volume != nullptr)
{ {
tool->volume->print_zs.push_back(unscale<double>(polyline.polyline.bounding_box().min(2))); tool->volume->print_zs.push_back(unscale<double>(polyline.polyline.bounding_box().min(2)));
tool->volume->offsets.push_back(tool->volume->indexed_vertex_array.quad_indices.size()); tool->volume->offsets.push_back(tool->volume->indexed_vertex_array.quad_indices.size());