Merge branch 'master' into kleontev/32517_dynamic_log_messages

diff --cc src/OBJECT/SMESH_DeviceActor.cxx
Simple merge

diff --cc src/SMESH/SMESH_Mesh.cxx
index eb575a5fea211baaaedd6143d25de7f4ff7596c1,5ff4c1830298e7bea5ee208a347ab3082f1bd83e..90f4a8a02cb8a31ba4bb41827079e315b28ec35c
--- 1/src/SMESH/SMESH_Mesh.cxx
--- 2/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@@ -735,9 -739,9 +735,9 @@@ SMESH_Mesh::RemoveHypothesis(const Topo
      throw SALOME_Exception(LOCALIZED("hypothesis does not exist"));
  
    SMESH_Hypothesis *anHyp = sc->mapHypothesis[anHypId];
 -  if(MYDEBUG) { SCRUTE(anHyp->GetType()); }
 +  SCRUTE(anHyp->GetType());
  
-   // shape 
+   // shape
  
    bool                     isAlgo = ( !anHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO );
    SMESH_subMesh::algo_event event = isAlgo ? SMESH_subMesh::REMOVE_ALGO : SMESH_subMesh::REMOVE_HYP;

diff --cc src/SMESH/SMESH_MeshEditor.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_2smeshpy.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_Gen_i.cxx
Simple merge