Merge commit 'd2cb3e2d6f20bc6b7d1cca13a6b6339a6f582cdb' into V9_12_BR

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index 95b51a474ac0d372bf6d7610f553a7838f08b165..11e0bb3b511d0451eb9c2a39bbb878112e847131 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -2631,7 +2631,7 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess, QStringList& theEntry
 
   _PTR(SObject) aMeshSO = SMESH::FindSObject(aMesh.in());
   if (aMeshSO) {
-    SMESH::SetName(aMeshSO, myDlg->objectText(SMESHGUI_MeshDlg::Obj));
+    if (aSubMeshVar->_is_nil()) SMESH::SetName(aMeshSO, myDlg->objectText(SMESHGUI_MeshDlg::Obj));
     theEntryList.append(aMeshSO->GetID().c_str());
   }