From dbc51a140d26e36480b74252b7b5a7a24d0e17f6 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Wed, 25 Sep 2019 12:06:38 +0200 Subject: [PATCH] Fixed erroneous use of logical OR where bitwise OR was meant Also, PrintBase::SlicingStatus enum had two entries assigned to 0 - removed the one that was never used --- src/libslic3r/PrintBase.hpp | 3 +-- src/slic3r/GUI/Plater.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/PrintBase.hpp b/src/libslic3r/PrintBase.hpp index aebc87904..05d884cc8 100644 --- a/src/libslic3r/PrintBase.hpp +++ b/src/libslic3r/PrintBase.hpp @@ -268,8 +268,7 @@ public: std::string text; // Bitmap of flags. enum FlagBits { - DEFAULT, - NO_RELOAD_SCENE = 0, + DEFAULT = 0, RELOAD_SCENE = 1 << 1, RELOAD_SLA_SUPPORT_POINTS = 1 << 2, RELOAD_SLA_PREVIEW = 1 << 3, diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index c7f1f4c5c..97c292703 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3322,7 +3322,7 @@ void Plater::priv::on_slicing_update(SlicingStatusEvent &evt) this->statusbar()->set_progress(evt.status.percent); this->statusbar()->set_status_text(_(evt.status.text) + wxString::FromUTF8("…")); } - if (evt.status.flags & (PrintBase::SlicingStatus::RELOAD_SCENE || PrintBase::SlicingStatus::RELOAD_SLA_SUPPORT_POINTS)) { + if (evt.status.flags & (PrintBase::SlicingStatus::RELOAD_SCENE | PrintBase::SlicingStatus::RELOAD_SLA_SUPPORT_POINTS)) { switch (this->printer_technology) { case ptFFF: this->update_fff_scene();