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

PropertExpressionEngine: Ignore dependencies that does not resolve to a document when verifying expressions.

Browse Source
This commit is contained in:
Eivind Kvedalen 2016-02-12 22:13:58 +01:00 committed by wmayer
parent 727a06689a
commit be671259cb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/App/PropertyExpressionEngine.cpp
View File

@ -656,11 +656,15 @@ std::string PropertyExpressionEngine::validateExpression(const ObjectIdentifier
// Get dependencies for the document object pointed to be *j // Get dependencies for the document object pointed to be *j
std::vector<DocumentObject*> targets; std::vector<DocumentObject*> targets;
targets.push_back(docObj); targets.push_back(docObj);
std::vector<DocumentObject*> deps = (*j).getDocument()->getDependencyList(targets);
for (std::vector<DocumentObject*>::const_iterator i = deps.begin(); i != deps.end(); ++i) { // Does the dependency resolve to a document? If not, ignore it
if (*i == pathDocObj) if ((*j).getDocument()) {
return (*j).toString() + " reference creates a cyclic dependency."; std::vector<DocumentObject*> deps = (*j).getDocument()->getDependencyList(targets);
for (std::vector<DocumentObject*>::const_iterator i = deps.begin(); i != deps.end(); ++i) {
if (*i == pathDocObj)
return (*j).toString() + " reference creates a cyclic dependency.";
}
} }
} }