Merge branch 'main' into toponamingTopoShapeWire

# Conflicts:
#	src/Mod/Part/App/TopoShape.h
#	src/Mod/Part/App/TopoShapeExpansion.cpp
#	tests/src/Mod/Part/App/TopoShapeExpansion.cpp

Signed-off-by: CalligaroV <vincenzo.calligaro@gmail.com>
This commit is contained in:
CalligaroV
2024-01-29 19:41:56 +01:00
252 changed files with 9077 additions and 4060 deletions

View File

@@ -3188,9 +3188,9 @@ bool TopoShape::fix()
// through makEWires(), and it will remove those edges. Without
// remapping, there will be invalid index jumpping in reference in
// Sketch002.ExternalEdge5.
makESHAPE(fixThis.Shape(), MapperHistory(fixThis), {*this});
makeShapeWithElementMap(fixThis.Shape(), MapperHistory(fixThis), {*this});
} else
makESHAPE(fix.Shape(), MapperHistory(fix), {copy});
makeShapeWithElementMap(fix.Shape(), MapperHistory(fix), {copy});
return true;
}