IPAL15344 (SMESH_MeshEditor.idl: signature of MergeEqualElements() was changed):

	use a new 'MergeElements()' functionality instead of 'MergeEqualElements()' one.

diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
index a2b391373b77c4bb77dfd20a5c9757fb81d817dd..b95c34acfc948ce20b4249535f1bd4fc83b501fb 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
@@ -641,7 +641,7 @@ bool SMESHGUI_EditMeshDlg::ClickOnApply()
     if( myAction == 0 )
       aMeshEditor->MergeNodes (aGroupsOfElements.inout());
     else
-      aMeshEditor->MergeEqualElements (aGroupsOfElements.inout());
+      aMeshEditor->MergeElements (aGroupsOfElements.inout());
 
     QApplication::restoreOverrideCursor();
   } catch(...) {