Merge branch 'master' into draft-feature_name

2021-04-29 12:40:27 +02:00
parent 05f290f119 d5393bb1e1
commit c0c49ebffc
443 changed files with 8499 additions and 22452 deletions
--- a/src/Mod/Draft/draftguitools/gui_shape2dview.py
+++ b/src/Mod/Draft/draftguitools/gui_shape2dview.py
@@ -64,7 +64,7 @@ class Shape2DView(gui_base_original.Modifier):
        super(Shape2DView, self).Activated(name="Project 2D view")
        if not Gui.Selection.getSelection():
            if self.ui:
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                _msg(translate("draft", "Select an object to project"))
                self.call = self.view.addEventCallback(
                    "SoEvent",