Changing version to 5.1.2

[modules/smesh.git] / src / SMESH_I / SMESH_MeshEditor_i.cxx

diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx
index 8fb61b896e89eafb46c63975dcc108759f014239..a68bd8fb2881eafbcf69120b4b98de859856c0cf 100644 (file)
--- a/src/SMESH_I/SMESH_MeshEditor_i.cxx
+++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx
@@ -80,7 +80,7 @@ namespace {
     SMDSAbs_ElementType myPreviewType; // type to show
     //!< Constructor
     TPreviewMesh(SMDSAbs_ElementType previewElements = SMDSAbs_All) {
-      _isShapeToMesh = _id =_studyId =_idDoc = 0;
+      _isShapeToMesh = (_id =_studyId =_idDoc = 0);
       _myMeshDS  = new SMESHDS_Mesh( _id, true );
       myPreviewType = previewElements;
     }
@@ -199,6 +199,7 @@ namespace {
         for (sm = subMeshes.begin(); sm != subMeshes.end(); sm++)
           sm->second->DeleteEventListener( this );
       }
+      myMesh = 0;
     }
   };
 
@@ -3874,11 +3875,7 @@ SMESH::SMESH_Mesh_ptr SMESH_MeshEditor_i::makeMesh(const char* theMeshName)
   SALOMEDS::Study_var study = gen->GetCurrentStudy();
   SALOMEDS::SObject_var meshSO = gen->ObjectToSObject( study, mesh );
   gen->SetName( meshSO, theMeshName, "Mesh" );
-
-  SALOMEDS::StudyBuilder_var builder = study->NewBuilder();
-  SALOMEDS::GenericAttribute_var anAttr
-    = builder->FindOrCreateAttribute( meshSO, "AttributePixMap" );
-  SALOMEDS::AttributePixMap::_narrow( anAttr )->SetPixMap( "ICON_SMESH_TREE_MESH_IMPORTED" );
+  gen->SetPixMap( meshSO, "ICON_SMESH_TREE_MESH_IMPORTED");
 
   return mesh._retn();
 }