Merge branch 'dev' into spot-removal-tool

2021-05-15 22:57:06 -07:00
parent 907da2db96 62996e16b1
commit ca4241109a
57 changed files with 4208 additions and 2488 deletions
--- a/rtgui/controlspotpanel.cc
+++ b/rtgui/controlspotpanel.cc
@@ -1021,6 +1021,7 @@ void ControlSpotPanel::spotMethodChanged()
        }
    } else if (spotMethod_->get_active_row_number() == 2) { // Full image case
        excluFrame->hide();
+        shape_->set_active(0);

        locX_->setValue(3000.);
        row[spots_.locX] = locX_->getIntValue();