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

2026-07-20 09:34:26 +00:00 · 2021-05-31 12:54:48 +02:00
parent 87815b0b16 02a0955a5f
commit f0354b43c1
31 changed files with 635 additions and 623 deletions
@@ -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;