Issue #378: Take into account sub-objects of composite feature in ModuleBase_Operatio...

diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp
index 96060b463837050075cb47244ca5f19fe8fabb13..3b799f6689042bbb207297df4e76c9eaf8ec0732 100644 (file)
--- a/src/ModuleBase/ModuleBase_Operation.cpp
+++ b/src/ModuleBase/ModuleBase_Operation.cpp
@@ -131,6 +131,20 @@ bool ModuleBase_Operation::hasObject(ObjectPtr theObj) const
       if (theObj == (*aIt))
         return true;
     }
+    CompositeFeaturePtr aCompFeature = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aFeature);
+    if (aCompFeature.get() != NULL) {
+      for (int i = 0; i < aCompFeature->numberOfSubs(); i++) {
+        FeaturePtr aSubFeature = aCompFeature->subFeature(i);
+        std::list<ResultPtr> aResults = aSubFeature->results();
+        std::list<ResultPtr>::const_iterator aIt;
+        for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
+          if (theObj == (*aIt))
+            return true;
+        }
+        if (aSubFeature == theObj)
+          return true;
+      }
+    }
   }
   return false;
 }