Merge branch 'main' into modernize-type-check

2023-10-25 16:07:28 -05:00
parent eb55f1fe52 41503d63eb
commit cbd0ef5975
50 changed files with 2407 additions and 1148 deletions
--- a/src/Gui/TaskView/TaskImage.cpp
+++ b/src/Gui/TaskView/TaskImage.cpp
@@ -529,7 +529,7 @@ void InteractiveScale::collectPoint(const SbVec3f& pos3d)

            midPoint = (points[0] + points[1]) / 2;

-            measureLabel->startEdit(getDistance(points[1]), this);
+            measureLabel->startEdit(getDistance(points[1]), this, true);

            Q_EMIT enableApplyBtn();
        }