Fix for the issue #2909 : Folder becomes empty after "export to GEOM"

[modules/shaper.git] / src / PartSet / PartSet_Tools.cpp

diff --git a/src/PartSet/PartSet_Tools.cpp b/src/PartSet/PartSet_Tools.cpp
index dcd677d5ab4b50b3a20cedcd0c307d4b0913204e..5779d33bb9113104757939211571e46636bbfdc7 100644 (file)
--- a/src/PartSet/PartSet_Tools.cpp
+++ b/src/PartSet/PartSet_Tools.cpp
@@ -772,14 +772,10 @@ void PartSet_Tools::getFirstAndLastIndexInFolder(const ObjectPtr& theFolder,
   if (!aFirstFeatureInFolder.get())
     return;
 
-  AttributeReferencePtr aLastFeatAttr =
-    aFolder->data()->reference(ModelAPI_Folder::LAST_FEATURE_ID());
-  if (!aLastFeatAttr.get())
-    return;
-  FeaturePtr aLastFeatureInFolder = ModelAPI_Feature::feature(aLastFeatAttr->value());
+  FeaturePtr aLastFeatureInFolder = aFolder->lastVisibleFeature();
   if (!aLastFeatureInFolder.get())
     return;
 
   theFirst = aDoc->index(aFirstFeatureInFolder);
   theLast = aDoc->index(aLastFeatureInFolder);
-}
\ No newline at end of file
+}