diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2022-01-12 17:54:48 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2022-01-12 17:54:48 +0300 |
| commit | a2dc1cd44640dda5f77a567f517f0c058d2604f5 (patch) | |
| tree | 708afc01763eb08b85a271e5757ffd840c9e6b81 /src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | |
| parent | 34a640a4a941d49d57cd599a8bc702d9ba99c5f0 (diff) | |
| parent | 657fb125fffb93ea4757a9a14fbdaaf643361acc (diff) | |
Fixed conflicts after merge with dev branch
Diffstat (limited to 'src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp')
| -rw-r--r-- | src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index bfad56c59..834b294ee 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -558,11 +558,12 @@ GLGizmoRotate3D::RotoptimzeWindow::RotoptimzeWindow(ImGuiWrapper * imgui, ImVec2 button_sz = {btn_txt_sz.x + padding.x, btn_txt_sz.y + padding.y}; ImGui::SetCursorPosX(padding.x + sz.x - button_sz.x); - if (wxGetApp().plater()->is_any_job_running()) + if (!wxGetApp().plater()->get_ui_job_worker().is_idle()) imgui->disabled_begin(true); if ( imgui->button(btn_txt) ) { - wxGetApp().plater()->optimize_rotation(); + replace_job(wxGetApp().plater()->get_ui_job_worker(), + std::make_unique<RotoptimizeJob>()); } imgui->disabled_end(); |