Fix calculation bounding box for flipped selection

diff --git a/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx b/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx
index 292f27d1bce2680470e8f8d24363dec0445f25f5..367e5f2dd48d8f60c6ab2a18d1dfbab8b72275e0 100644 (file)
--- a/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx
+++ b/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx
@@ -125,7 +125,7 @@ namespace
         Bnd_Box aBoundingBox;
         anObject->BoundingBox (aBoundingBox);
 
-        // processing presentations with own flipping
+        // processing presentations with own flipping and transform persistence
         for (PrsMgr_Presentations::Iterator aPrsIter(anObject->Presentations()); aPrsIter.More(); aPrsIter.Next())
         {
           const Handle(PrsMgr_Presentation)& aPrs3d = aPrsIter.Value();
@@ -138,7 +138,7 @@ namespace
           {
             const Handle(Graphic3d_Group)& aGroup = aGroupIter.Value();
             const Graphic3d_BndBox4f& aBndBox = aGroup->BoundingBox();
-            if (aGroup->Flipper().IsNull()
+            if ((aGroup->Flipper().IsNull() && aGroup->TransformPersistence().IsNull())
              || !aBndBox.IsValid())
             {
               continue;
@@ -147,8 +147,19 @@ namespace
             Bnd_Box aGroupBox;
             aGroupBox.Update (aBndBox.CornerMin().x(), aBndBox.CornerMin().y(), aBndBox.CornerMin().z(),
                               aBndBox.CornerMax().x(), aBndBox.CornerMax().y(), aBndBox.CornerMax().z());
-            aGroup->Flipper()->Apply (theWorldViewMat, aGroupBox);
 
+            if (!aGroup->Flipper().IsNull())
+            {
+              aGroup->Flipper()->Apply (theWorldViewMat, aGroupBox);
+            }
+
+            if (!aGroup->TransformPersistence().IsNull())
+            {
+              aGroup->TransformPersistence()->Apply (theCamera,
+                                                     theProjectionMat, theWorldViewMat,
+                                                     theWinSize.x(), theWinSize.y(),
+                                                     aGroupBox);
+            }
             aBoundingBox.Add (aGroupBox);
           }
         }
@@ -162,36 +173,6 @@ namespace
                                                    aBoundingBox);
         }
 
-        // processing presentations with own transform persistence
-        for (PrsMgr_Presentations::Iterator aPrsIter (anObject->Presentations()); aPrsIter.More(); aPrsIter.Next())
-        {
-          const Handle(PrsMgr_Presentation)& aPrs3d = aPrsIter.Value();
-          if (!aPrs3d->CStructure()->HasGroupTransformPersistence())
-          {
-            continue;
-          }
-
-          for (Graphic3d_SequenceOfGroup::Iterator aGroupIter (aPrs3d->Groups()); aGroupIter.More(); aGroupIter.Next())
-          {
-            const Handle(Graphic3d_Group)& aGroup = aGroupIter.Value();
-            const Graphic3d_BndBox4f& aBndBox = aGroup->BoundingBox();
-            if (aGroup->TransformPersistence().IsNull()
-            || !aBndBox.IsValid())
-            {
-              continue;
-            }
-
-            Bnd_Box aGroupBox;
-            aGroupBox.Update (aBndBox.CornerMin().x(), aBndBox.CornerMin().y(), aBndBox.CornerMin().z(),
-                              aBndBox.CornerMax().x(), aBndBox.CornerMax().y(), aBndBox.CornerMax().z());
-            aGroup->TransformPersistence()->Apply (theCamera,
-                                                   theProjectionMat, theWorldViewMat,
-                                                   theWinSize.x(), theWinSize.y(),
-                                                   aGroupBox);
-            aBoundingBox.Add (aGroupBox);
-          }
-        }
-
         if (aBoundingBox.IsVoid())
         {
           myBoundings.Add (new Select3D_HBndBox3d());