Merge branch 'master' into gni/adaptation

diff --cc src/SMESHGUI/SMESHGUI.cxx
index 0473734925f6a99631d12c35ca877bb01efccb9b,f638d0391b8722e5ca7be3470c7fdd2a7d138a2b..ecae8b802e235abed320a3715832b598a10f653e
--- 1/src/SMESHGUI/SMESHGUI.cxx
--- 2/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";