From 8cf8e061647c5a2ad9667d54513bb84fe627536d Mon Sep 17 00:00:00 2001 From: Filip Sykala Date: Wed, 11 May 2022 16:46:44 +0200 Subject: [PATCH] Fix: ../src/slic3r/GUI/Jobs/EmbossJob.cpp:388:21: warning: 'Slic3r::ModelVolume* get_volume(const Slic3r::ObjectID&)' defined but not used [-Wunused-function] --- src/slic3r/GUI/Jobs/EmbossJob.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/slic3r/GUI/Jobs/EmbossJob.cpp b/src/slic3r/GUI/Jobs/EmbossJob.cpp index 899fed7a4a..2507cb159b 100644 --- a/src/slic3r/GUI/Jobs/EmbossJob.cpp +++ b/src/slic3r/GUI/Jobs/EmbossJob.cpp @@ -376,19 +376,6 @@ TriangleMesh priv::create_default_mesh() return triangle_mesh; } -static ModelVolume *get_volume(const ObjectID &volume_id, Model &model) -{ - for (auto obj : model.objects) - for (auto vol : obj->volumes) - if (vol->id() == volume_id) - return vol; - return nullptr; -} - -static ModelVolume *get_volume(const ObjectID &volume_id) { - return get_volume(volume_id, wxGetApp().plater()->model()); -} - void priv::update_volume(TriangleMesh &&mesh, const EmbossDataUpdate &data) { @@ -406,7 +393,13 @@ void priv::update_volume(TriangleMesh &&mesh, std::string snap_name = GUI::format(_L("Text: %1%"), data.text_configuration.text); Plater::TakeSnapshot snapshot(plater, snap_name, UndoRedo::SnapshotType::GizmoAction); - ModelVolume *volume = get_volume(data.volume_id, plater->model()); + auto get_volume = [&model = plater->model()](const ObjectID &volume_id)->ModelVolume *{ + for (ModelObject* obj : model.objects) + for (ModelVolume* vol : obj->volumes) + if (vol->id() == volume_id) return vol; + return nullptr; + }; + ModelVolume *volume = get_volume(data.volume_id); // could appear when user delete edited volume if (volume == nullptr) return;