diff options
| author | YuSanka <yusanka@gmail.com> | 2020-01-23 14:49:39 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2020-01-23 18:11:21 +0300 |
| commit | 1ed313ab7983bed9a1911da153ce2e3e0b473d6f (patch) | |
| tree | bcf43c3f70851920e97ae473986630a4ccc44d54 /src/slic3r/GUI/GLCanvas3D.hpp | |
| parent | 3d9ac0ada19107c20c75ea6fa21336276cd2b935 (diff) | |
Synchronized mode of color_print data to/from 3mf/amf
+ Code refactoring " CustomGCode extracted to separate namespace and file
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 d4386f7f3..9ea7568e4 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -557,7 +557,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(); @@ -720,7 +720,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); |