suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sketcher: Fix duplicate external avoidance false positives

Browse Source 
Attempting to link to Edge1 of one object failed when there was already
an Edge1 linked from another object.
This commit is contained in:
DeepSOIC 2015-05-12 03:33:09 +03:00 committed by Stefan Tröger
parent 05b9dd60e3
commit f31aed1c40
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2760,12 +2760,18 @@ int SketchObject::addExternal(App::DocumentObject *Obj, const char* SubName)
const std::vector<DocumentObject*> originalObjects = Objects;
const std::vector<std::string> originalSubElements = SubElements;
std::vector<std::string>::iterator it;
it = std::find(SubElements.begin(), SubElements.end(), SubName);
// avoid duplicates
if (it != SubElements.end())
if (Objects.size() != SubElements.size()) {
assert(0 /*counts of objects and subelements in external geometry links do not match*/);
Base::Console().Error("Internal error: counts of objects and subelements in external geometry links do not match\n");
return -1;
}
for (int i = 0 ; i < Objects.size() ; i++){
if (Objects[i] == Obj && std::string(SubName) == SubElements[i]){
Base::Console().Error("Link to %s already exists in this sketch.\n",SubName);
return -1;
}
}
// add the new ones
Objects.push_back(Obj);