From 8a864791fe7aaed130abf2567161584ef8ab6e14 Mon Sep 17 00:00:00 2001
From: aba <aba@opencascade.com>
Date: Wed, 3 Dec 2014 18:21:00 +0300
Subject: [PATCH] 0025492: the selected subshape does not have topological
 relationship with orginal shape in OCC680:

returned identity owner location if the selectable object has identity transformation.
---
 src/SelectMgr/SelectMgr_EntityOwner.cxx |  2 +-
 tests/bugs/vis/bug25492                 | 32 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 tests/bugs/vis/bug25492

diff --git a/src/SelectMgr/SelectMgr_EntityOwner.cxx b/src/SelectMgr/SelectMgr_EntityOwner.cxx
index 692713c76d..351754590f 100644
--- a/src/SelectMgr/SelectMgr_EntityOwner.cxx
+++ b/src/SelectMgr/SelectMgr_EntityOwner.cxx
@@ -129,7 +129,7 @@ void SelectMgr_EntityOwner::SetLocation(const TopLoc_Location&)
 
 TopLoc_Location SelectMgr_EntityOwner::Location() const
 {
-  return !HasSelectable() ? TopLoc_Location() : TopLoc_Location(mySelectable->Transformation());
+  return !HasLocation() ? TopLoc_Location() : TopLoc_Location(mySelectable->Transformation());
 }
 
 void SelectMgr_EntityOwner::ResetLocation()
diff --git a/tests/bugs/vis/bug25492 b/tests/bugs/vis/bug25492
new file mode 100644
index 0000000000..e844b6b25f
--- /dev/null
+++ b/tests/bugs/vis/bug25492
@@ -0,0 +1,32 @@
+puts "============"
+puts "CR25492"
+puts "============"
+puts ""
+#######################################################################
+# The selected subshape does not have topological relationship
+# with orginal shape in OCC680
+#######################################################################
+pload ALL
+
+set isEqual 0
+vinit
+box aShape 5 5 5 3 3 3
+vdisplay aShape
+vfit
+vselmode 4 1
+vselect 100 200
+vpickselected aSub
+explode aShape F
+
+
+for {set i 1} {$i <= 6 } {incr i} {
+  set aRes [compare aShape_$i aSub];
+  if { [lsearch $aRes equal] != -1} {
+    set isEqual 1
+  }
+}
+
+if {$isEqual == 0} {
+puts "Error: No selected sub-shape was found in exploded sub-shapes"
+}
+set only_screen 1