Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_seams_as_models

This commit is contained in:
enricoturri1966 2021-08-30 08:37:51 +02:00
commit 7a3f8c0a4c
17 changed files with 342 additions and 153 deletions

View file

@ -283,11 +283,11 @@ void GLGizmoSimplify::process()
}
};
std::function<void(int)> statusfn = [this](int percent) {
int64_t last = 0;
std::function<void(int)> statusfn = [this, &last](int percent) {
m_progress = percent;
// check max 4fps
static int64_t last = 0;
int64_t now = m_parent.timestamp_now();
if ((now - last) < 250) return;
last = now;