X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FBOPDS%2FBOPDS_Iterator.cxx;h=d6408bfe29ce0d560a354a0fb3019d52c5251b88;hp=71c798a6b97e8190982de1e0998e2a7c1ccccf1a;hb=72e88cf7a81fdfe631da0a9ea38db9c862928de9;hpb=fa13a85d92992a775e10eafc6876cd3137ee9482

diff --git a/src/BOPDS/BOPDS_Iterator.cxx b/src/BOPDS/BOPDS_Iterator.cxx
index 71c798a..d6408bf 100644
--- a/src/BOPDS/BOPDS_Iterator.cxx
+++ b/src/BOPDS/BOPDS_Iterator.cxx
@@ -205,7 +205,7 @@
   void BOPDS_Iterator::Intersect()
 {
   Standard_Boolean bFlag;
-  Standard_Integer aNb, i, aNbB, aNbR;
+  Standard_Integer aNb, i, aNbB, aNbR, iTi, iTj;
   Standard_Integer i1, i2, aNbSD, iX, j, iDS, jB, iR;
   TopAbs_ShapeEnum aTi, aTj;
   Handle(NCollection_IncAllocator) aAllocator;
@@ -283,6 +283,21 @@
 	  continue;// same range
 	}
 	//
+	const BOPDS_ShapeInfo& aSIj=myDS->ShapeInfo(j);
+	aTj=aSIj.ShapeType();
+	iTi=BOPDS_Tools::TypeToInteger(aTi);
+	iTj=BOPDS_Tools::TypeToInteger(aTj);
+	bFlag=Standard_False;
+	if (iTi<iTj) {
+	  bFlag=aSI.HasSubShape(j);
+	} 
+	else if (iTj<iTi) {
+	   bFlag=aSIj.HasSubShape(i);
+	}
+	if (bFlag) {
+	  continue; 
+	}
+	//
 	aPKXB.SetIds(i, j);
 	if (aMPKXB.Add(aPKXB)) {
 	  bFlag=Standard_False;// Bounding boxes are intersected
@@ -291,7 +306,6 @@
 	    bFlag=!bFlag; //Bounding boxes of Sub-shapes are intersected
 	  }
 	  //
-	  aTj=myDS->ShapeInfo(j).ShapeType();
 	  iX=BOPDS_Tools::TypeToInteger(aTi, aTj);
 	  aPKXB.SetFlag(bFlag);
 	  myLists(iX).Append(aPKXB);