diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2020-01-23 19:43:18 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2020-01-23 19:43:18 +0300 |
| commit | b45e95877e9753b9f111c09001d49af1f3206cb2 (patch) | |
| tree | 62a8cfb9a9d3a97b7ab665168ca90b75cbed0fa2 /src/slic3r/GUI/GLCanvas3D.hpp | |
| parent | cb39f6b212eab1be2b916fb8f9125a89818b252c (diff) | |
| parent | a0e6afcee871d74de2d7dacb1e798215e62646ca (diff) | |
Merge branch 'master' into lm_tm_hollowing
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3D.hpp')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index c842c7b42..a7f272f97 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -558,7 +558,7 @@ public: void load_gcode_preview(const GCodePreviewData& preview_data, const std::vector<std::string>& str_tool_colors); void load_sla_preview(); - void load_preview(const std::vector<std::string>& str_tool_colors, const std::vector<Model::CustomGCode>& color_print_values); + void load_preview(const std::vector<std::string>& str_tool_colors, const std::vector<CustomGCode::Item>& color_print_values); void bind_event_handlers(); void unbind_event_handlers(); @@ -721,7 +721,7 @@ private: // Adds a new Slic3r::GUI::3DScene::Volume to $self->volumes, // one for perimeters, one for infill and one for supports. void _load_print_object_toolpaths(const PrintObject& print_object, const std::vector<std::string>& str_tool_colors, - const std::vector<Model::CustomGCode>& color_print_values); + const std::vector<CustomGCode::Item>& color_print_values); // Create 3D thick extrusion lines for wipe tower extrusions void _load_wipe_tower_toolpaths(const std::vector<std::string>& str_tool_colors); |