diff --git a/resources/profiles/Artillery/bed-x1.png b/resources/profiles/Artillery/bed-x1.png index 16062e93c1..bcf2e85eb4 100644 Binary files a/resources/profiles/Artillery/bed-x1.png and b/resources/profiles/Artillery/bed-x1.png differ diff --git a/resources/profiles/RatRig/rr-vc-300.stl b/resources/profiles/RatRig/rr-vc-300.stl index 282f31a084..640e86890f 100644 Binary files a/resources/profiles/RatRig/rr-vc-300.stl and b/resources/profiles/RatRig/rr-vc-300.stl differ diff --git a/resources/profiles/RatRig/rr-vc-400.stl b/resources/profiles/RatRig/rr-vc-400.stl index 8605f3eccd..422354ee20 100644 Binary files a/resources/profiles/RatRig/rr-vc-400.stl and b/resources/profiles/RatRig/rr-vc-400.stl differ diff --git a/resources/profiles/RatRig/rr-vc-500.stl b/resources/profiles/RatRig/rr-vc-500.stl index 75f1878458..5427b11577 100644 Binary files a/resources/profiles/RatRig/rr-vc-500.stl and b/resources/profiles/RatRig/rr-vc-500.stl differ diff --git a/src/slic3r/GUI/GLModel.cpp b/src/slic3r/GUI/GLModel.cpp index c84d4a512a..2ef77e5053 100644 --- a/src/slic3r/GUI/GLModel.cpp +++ b/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) { diff --git a/src/slic3r/GUI/GLModel.hpp b/src/slic3r/GUI/GLModel.hpp index 60fb9ae189..84281ed605 100644 --- a/src/slic3r/GUI/GLModel.hpp +++ b/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