diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 5c7644faaf..63c4e678fe 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -991,7 +991,7 @@ void CmdPartDesignPad::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](Part::Feature* profile, std::string FeatName) { + auto worker = [cmd](Part::Feature* profile, std::string FeatName) { if (FeatName.empty()) return; @@ -1042,7 +1042,7 @@ void CmdPartDesignPocket::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](Part::Feature* sketch, std::string FeatName) { + auto worker = [cmd](Part::Feature* sketch, std::string FeatName) { if (FeatName.empty()) return; @@ -1089,7 +1089,7 @@ void CmdPartDesignHole::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](Part::Feature* sketch, std::string FeatName) { + auto worker = [cmd](Part::Feature* sketch, std::string FeatName) { if (FeatName.empty()) return; @@ -1135,7 +1135,7 @@ void CmdPartDesignRevolution::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd, &pcActiveBody](Part::Feature* sketch, std::string FeatName) { + auto worker = [cmd, &pcActiveBody](Part::Feature* sketch, std::string FeatName) { if (FeatName.empty()) return; @@ -1195,7 +1195,7 @@ void CmdPartDesignGroove::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd, &pcActiveBody](Part::Feature* sketch, std::string FeatName) { + auto worker = [cmd, &pcActiveBody](Part::Feature* sketch, std::string FeatName) { if (FeatName.empty()) return; @@ -1263,7 +1263,7 @@ void CmdPartDesignAdditivePipe::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](Part::Feature* sketch, std::string FeatName) { + auto worker = [cmd](Part::Feature* sketch, std::string FeatName) { if (FeatName.empty()) return; @@ -1313,7 +1313,7 @@ void CmdPartDesignSubtractivePipe::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](Part::Feature* sketch, std::string FeatName) { + auto worker = [cmd](Part::Feature* sketch, std::string FeatName) { if (FeatName.empty()) return; @@ -1363,7 +1363,7 @@ void CmdPartDesignAdditiveLoft::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](Part::Feature* sketch, std::string FeatName) { + auto worker = [cmd](Part::Feature* sketch, std::string FeatName) { if (FeatName.empty()) return; @@ -1413,7 +1413,7 @@ void CmdPartDesignSubtractiveLoft::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](Part::Feature* sketch, std::string FeatName) { + auto worker = [cmd](Part::Feature* sketch, std::string FeatName) { if (FeatName.empty()) return; @@ -1838,7 +1838,7 @@ void CmdPartDesignMirrored::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](std::string FeatName, std::vector features) { + auto worker = [cmd](std::string FeatName, std::vector features) { if (features.empty()) return; @@ -1902,7 +1902,7 @@ void CmdPartDesignLinearPattern::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](std::string FeatName, std::vector features) { + auto worker = [cmd](std::string FeatName, std::vector features) { if (features.empty()) return; @@ -1968,7 +1968,7 @@ void CmdPartDesignPolarPattern::activated(int iMsg) return; Gui::Command* cmd = this; - auto worker = [this, cmd](std::string FeatName, std::vector features) { + auto worker = [cmd](std::string FeatName, std::vector features) { if (features.empty()) return; @@ -2025,10 +2025,10 @@ void CmdPartDesignScaled::activated(int iMsg) { Q_UNUSED(iMsg); Gui::Command* cmd = this; - auto worker = [this, cmd](std::string FeatName, std::vector features) { + auto worker = [cmd](std::string FeatName, std::vector features) { if (features.empty()) - return; + return; doCommand(Doc,"App.activeDocument().%s.Factor = 2", FeatName.c_str()); doCommand(Doc,"App.activeDocument().%s.Occurrences = 2", FeatName.c_str()); @@ -2130,7 +2130,7 @@ void CmdPartDesignMultiTransform::activated(int iMsg) } else { Gui::Command* cmd = this; - auto worker = [this, cmd, pcActiveBody](std::string FeatName, std::vector features) { + auto worker = [cmd, pcActiveBody](std::string FeatName, std::vector features) { if (features.empty()) return; diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp index 3b85e03629..5b5f79de17 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.cpp +++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp @@ -150,7 +150,9 @@ void ViewProvider::unsetEdit(int ModNum) if (ModNum == ViewProvider::Default) { // when pressing ESC make sure to close the dialog +#if 0 PartDesign::Body* activeBody = Gui::Application::Instance->activeView()->getActiveObject(PDBODYKEY); +#endif Gui::Control().closeDialog(); #if 0 if ((activeBody != NULL) && (oldTip != NULL)) {