From 36dc3d20372ff37c6c3b35e1fd10ae4c8f945517 Mon Sep 17 00:00:00 2001
From: ika <ika@opencascade.com>
Date: Thu, 28 Mar 2024 11:27:01 +0000
Subject: [PATCH] 0033371: USD - Implementation of import and export USD files
 using the USD SDK. 1 Stage

Do auxiliary improvement in OCCT.
---
 src/RWMesh/RWMesh_CafReader.cxx | 10 ++++++++++
 src/RWMesh/RWMesh_CafReader.hxx |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/RWMesh/RWMesh_CafReader.cxx b/src/RWMesh/RWMesh_CafReader.cxx
index d1086ff15b..aa2f2f9128 100644
--- a/src/RWMesh/RWMesh_CafReader.cxx
+++ b/src/RWMesh/RWMesh_CafReader.cxx
@@ -383,6 +383,16 @@ Standard_Boolean RWMesh_CafReader::addShapeIntoDoc (CafDocumentTools& theTools,
     return Standard_False;
   }
 
+  if (toMakeAssembly)
+  {
+    TDF_Label aRefLabel;
+    theTools.ShapeTool->GetReferredShape(aNewLabel, aRefLabel);
+    if (!aRefLabel.IsNull())
+    {
+      theTools.OriginalShapeMap.Bind(theShape, aRefLabel);
+    }
+  }
+
   // if new label is a reference get referred shape
   TDF_Label aNewRefLabel = aNewLabel;
   theTools.ShapeTool->GetReferredShape (aNewLabel, aNewRefLabel);
diff --git a/src/RWMesh/RWMesh_CafReader.hxx b/src/RWMesh/RWMesh_CafReader.hxx
index 5e93d60b3e..f1bc35edcb 100644
--- a/src/RWMesh/RWMesh_CafReader.hxx
+++ b/src/RWMesh/RWMesh_CafReader.hxx
@@ -57,6 +57,7 @@ public:
     Handle(XCAFDoc_ColorTool)       ColorTool;
     Handle(XCAFDoc_VisMaterialTool) VisMaterialTool;
     NCollection_DataMap<TopoDS_Shape, TDF_Label, TopTools_ShapeMapHasher> ComponentMap;
+    NCollection_DataMap<TopoDS_Shape, TDF_Label, TopTools_ShapeMapHasher> OriginalShapeMap;
   };
 
 public: