From e0dd7edb21984b2800ff06d1c05b2bb8a655e2d3 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 13 May 2021 14:56:35 +0200 Subject: [PATCH] Removed obsolete method from GLVolumeCollection --- src/slic3r/GUI/3DScene.cpp | 22 ---------------------- src/slic3r/GUI/3DScene.hpp | 2 -- 2 files changed, 24 deletions(-) diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index 00bad52ff..462594f0f 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -1071,28 +1071,6 @@ std::string GLVolumeCollection::log_memory_info() const return " (GLVolumeCollection RAM: " + format_memsize_MB(this->cpu_memory_used()) + " GPU: " + format_memsize_MB(this->gpu_memory_used()) + " Both: " + format_memsize_MB(this->gpu_memory_used()) + ")"; } -bool can_export_to_obj(const GLVolume& volume) -{ - if (!volume.is_active || !volume.is_extrusion_path) - return false; - - bool has_triangles = !volume.indexed_vertex_array.triangle_indices.empty() || (std::min(volume.indexed_vertex_array.triangle_indices_size, volume.tverts_range.second - volume.tverts_range.first) > 0); - bool has_quads = !volume.indexed_vertex_array.quad_indices.empty() || (std::min(volume.indexed_vertex_array.quad_indices_size, volume.qverts_range.second - volume.qverts_range.first) > 0); - - return has_triangles || has_quads; -} - -bool GLVolumeCollection::has_toolpaths_to_export() const -{ - for (const GLVolume* volume : this->volumes) - { - if (can_export_to_obj(*volume)) - return true; - } - - return false; -} - // caller is responsible for supplying NO lines with zero length static void thick_lines_to_indexed_vertex_array( const Lines &lines, diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index 2d46a4524..db64bdab5 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -590,8 +590,6 @@ public: // Return CPU, GPU and total memory log line. std::string log_memory_info() const; - bool has_toolpaths_to_export() const; - private: GLVolumeCollection(const GLVolumeCollection &other); GLVolumeCollection& operator=(const GLVolumeCollection &);