kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Sketcher] Fix issue in replaceGeometries when more old than new

Browse Source
This commit is contained in:
Ajinkya Dahale
2025-04-07 02:56:05 +05:30
parent ede7013f55
commit 404482f48e
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -2021,6 +2021,7 @@ int SketchObject::delGeometriesExclusiveList(const std::vector<int>& GeoIds, Del
return 0;
}
// clang-format on
void SketchObject::replaceGeometries(std::vector<int> oldGeoIds,
std::vector<Part::Geometry*>& newGeos)
{
@@ -2042,18 +2043,17 @@ void SketchObject::replaceGeometries(std::vector<int> oldGeoIds,
newVals[*oldGeoIdIter] = *newGeoIter;
}
if (newGeoIter != newGeos.end()) {
for (; newGeoIter != newGeos.end(); ++newGeoIter) {
generateId(*newGeoIter);
newVals.push_back(*newGeoIter);
}
}
else {
delGeometries(oldGeoIdIter, oldGeoIds.end());
for (; newGeoIter != newGeos.end(); ++newGeoIter) {
generateId(*newGeoIter);
newVals.push_back(*newGeoIter);
}
// Set geometries first, then delete the old ones. This allows to use `delGeometries`.
Geometry.setValues(std::move(newVals));
delGeometries(oldGeoIdIter, oldGeoIds.end());
}
// clang-format off
int SketchObject::deleteAllGeometry(DeleteOptions options)
{