Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3

src/slic3r/GUI/GLModel.cpp

@@ -209,7 +209,6 @@ Vec2f GLModel::Geometry::extract_tex_coord_2(size_t id) const
     return { *(start + 0), *(start + 1) };
 }
 
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 void GLModel::Geometry::set_vertex(size_t id, const Vec3f& position, const Vec3f& normal)
 {
     assert(format.vertex_layout == EVertexLayout::P3N3);
@@ -251,7 +250,6 @@ void GLModel::Geometry::remove_vertex(size_t id)
         vertices.erase(it, it + stride);
     }
 }
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
 
 size_t GLModel::Geometry::vertex_stride_floats(const Format& format)
 {

src/slic3r/GUI/GLModel.hpp

@@ -88,8 +88,7 @@ namespace GUI {
             ColorRGBA color{ ColorRGBA::BLACK() };
 
             void reserve_vertices(size_t vertices_count) { vertices.reserve(vertices_count * vertex_stride_floats(format)); }
-            void reserve_indices(size_t indices_count) { indices.reserve(indices_count * index_stride_bytes(*this)); }
-
+            void reserve_indices(size_t indices_count) { indices.reserve(indices_count); }
 
             void add_vertex(const Vec2f& position);                          // EVertexLayout::P2
             void add_vertex(const Vec2f& position, const Vec2f& tex_coord);  // EVertexLayout::P2T2