From 80e4b36f371291609d342225633709d03d18408c Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Fri, 28 Sep 2018 16:30:31 +0200 Subject: [PATCH] Sketcher: No equality to be applied to external axes fixes #3532 --- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 7d0b7bc5cd..bf3b0930ce 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -6606,18 +6606,20 @@ void CmdSketcherConstrainEqual::activated(int iMsg) QObject::tr("Select two or more compatible edges")); return; } - else if (isPointOrSegmentFixed(Obj,GeoId)) { - if (GeoId == Sketcher::GeoEnum::HAxis || GeoId == Sketcher::GeoEnum::VAxis) { + else if (GeoId == Sketcher::GeoEnum::HAxis || GeoId == Sketcher::GeoEnum::VAxis) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QObject::tr("Sketch axes cannot be used in equality constraints")); return; - } - else if (hasAlreadyExternal) { + } + else if (isPointOrSegmentFixed(Obj,GeoId)) { + + if (hasAlreadyExternal) { showNoConstraintBetweenFixedGeometry(); return; } - else + else { hasAlreadyExternal = true; + } } const Part::Geometry *geo = Obj->getGeometry(GeoId);