juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts after merge with master + fixed rendering of hovered gizmo grabbers

Browse Source
This commit is contained in:
enricoturri1966
2021-05-31 12:54:48 +02:00
parent 87815b0b16 02a0955a5f
commit f0354b43c1
31 changed files with 635 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GCodeViewer.hpp
View File

@@ -619,6 +619,8 @@ private:
std::vector<ExtrusionRole> m_roles;
size_t m_extruders_count;
std::vector<unsigned char> m_extruder_ids;
std::vector<float> m_filament_diameters;
std::vector<float> m_filament_densities;
Extrusions m_extrusions;
SequentialView m_sequential_view;
Shells m_shells;