From 3a760d61e4ae61b6bf4dc7a0558d1509104615f1 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 15 Jun 2022 15:32:34 +0200 Subject: [PATCH] Tech ENABLE_RAYCAST_PICKING - Fixed other warnings on Mac --- src/slic3r/GUI/3DScene.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index 5d4c25d718..83b8cae639 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -1055,12 +1055,12 @@ int GLVolumeCollection::load_wipe_tower_preview( }; TriangleMesh tooth_mesh; - indexed_triangle_set its = generate_lateral(0.0f, 38.453f); - tooth_mesh.merge(TriangleMesh(std::move(its))); - its = generate_central(); - tooth_mesh.merge(TriangleMesh(std::move(its))); - its = generate_lateral(61.547f, 100.0f); - tooth_mesh.merge(TriangleMesh(std::move(its))); + indexed_triangle_set data = generate_lateral(0.0f, 38.453f); + tooth_mesh.merge(TriangleMesh(std::move(data))); + data = generate_central(); + tooth_mesh.merge(TriangleMesh(std::move(data))); + data = generate_lateral(61.547f, 100.0f); + tooth_mesh.merge(TriangleMesh(std::move(data))); #else float out_points_idx[][3] = { { 0, -depth, 0 }, { 0, 0, 0 }, { 38.453f, 0, 0 }, { 61.547f, 0, 0 }, { 100.0f, 0, 0 }, { 100.0f, -depth, 0 }, { 55.7735f, -10.0f, 0 }, { 44.2265f, 10.0f, 0 }, { 38.453f, 0, 1 }, { 0, 0, 1 }, { 0, -depth, 1 }, { 100.0f, -depth, 1 }, { 100.0f, 0, 1 }, { 61.547f, 0, 1 }, { 55.7735f, -10.0f, 1 }, { 44.2265f, 10.0f, 1 } }; @@ -1161,8 +1161,10 @@ int GLVolumeCollection::load_wipe_tower_preview( return its; }; - mesh.merge(TriangleMesh(std::move(generate_negx_cap()))); - mesh.merge(TriangleMesh(std::move(generate_posx_cap()))); + data = generate_negx_cap(); + mesh.merge(TriangleMesh(std::move(data))); + data = generate_posx_cap(); + mesh.merge(TriangleMesh(std::move(data))); mesh.scale(Vec3f(width / (n * 100.0f), 1.0f, height)); // Scaling to proper width #else mesh.scale(Vec3f(width / (n * min_width), 1.f, height)); // Scaling to proper width