From: akl <akl@opencascade.com>
Date: Tue, 27 Mar 2007 09:34:15 +0000 (+0000)
Subject: IPAL15344 (SMESH_MeshEditor.idl: signature of MergeEqualElements() was changed):
X-Git-Tag: V3_2_6pre3~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d019e0815b9b6eb333b2d69bcff2e4b03e062233;p=modules%2Fsmesh.git

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 a2b391373..b95c34acf 100644
--- 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(...) {