From: Gérald NICOLAS <gerald.nicolas@edf.fr>
Date: Wed, 27 May 2020 08:40:52 +0000 (+0200)
Subject: Merge branch 'master' into gni/adaptation
X-Git-Tag: V9_7_0a1~18^2~91
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=687effe75f22609b2a83dcc70bc00732e73c705c

Merge branch 'master' into gni/adaptation
---

687effe75f22609b2a83dcc70bc00732e73c705c
diff --cc src/SMESHGUI/SMESHGUI.cxx
index 047373492,f638d0391..ecae8b802
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@@ -4758,10 -4709,7 +4758,11 @@@ void SMESHGUI::initialize( CAM_Applicat
    //popupMgr()->insert( separator(), -1, 0 );
  
    //popupMgr()->insert( separator(), -1, 0 );
+ 
 +//   createPopupItem( SMESHOp::OpUniformRefinement, OB, mesh );
 +//   createPopupItem( SMESHOp::OpHOMARDRefinement,  OB, mesh );
 +//   createPopupItem( SMESHOp::OpMGAdapt,           OB, mesh );
 +
    QString only_one_non_empty = QString( " && %1=1 && numberOfNodes>0" ).arg( dc );
    QString multiple_non_empty = QString( " && %1>0 && numberOfNodes>0" ).arg( dc );
    QString only_one_2D        = only_one_non_empty + " && dim>1";