Regression revealed after restoring mesh data destruction at study closing

diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
index 67d0c60698a1b2ada85c9f3935bc1395003b4065..ceaeb1acb681d86934f3c211e4b07704a6a7622b 100644 (file)
--- a/src/SMESH/SMESH_MeshEditor.cxx
+++ b/src/SMESH/SMESH_MeshEditor.cxx
@@ -6771,8 +6771,8 @@ SMESH_MeshEditor::PGroupIDs SMESH_MeshEditor::Offset( TIDSortedElemSet & theElem
       meshDS->RemoveFreeElement( eIt->next(), 0 );
   }
 
       meshDS->RemoveFreeElement( eIt->next(), 0 );
   }
 

-  offsetMesh->Modified();
-  offsetMesh->CompactMesh(); // make IDs start from 1
+  // offsetMesh->Modified();
+  // offsetMesh->CompactMesh(); // make IDs start from 1

 
   // source elements for each generated one
   SMESH_SequenceOfElemPtr srcElems, srcNodes;
 
   // source elements for each generated one
   SMESH_SequenceOfElemPtr srcElems, srcNodes;

diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index a3b12c77e5da711defef4ca81fc533a19f275ea2..7bab8d9e74cba84dc539cbfe16bb52fe83383501 100644 (file)
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -1683,6 +1683,8 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event)
           else
             updateDependantsState( SUBMESH_COMPUTED );
         }
           else
             updateDependantsState( SUBMESH_COMPUTED );
         }

+        // let algo clear its data gathered while algo->Compute()
+        algo->CheckHypothesis((*_father), _subShape, hyp_status);

       }
       break;
     case COMPUTE_CANCELED:               // nothing to do
       }
       break;
     case COMPUTE_CANCELED:               // nothing to do

diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py
index b4c07b9f4f25415223a21ce29eb7a361de191c5e..d0bb913c11682872c1ef060c2bcc26a2d4dfd135 100755 (executable)
--- a/src/SMESH_SWIG/smeshBuilder.py
+++ b/src/SMESH_SWIG/smeshBuilder.py
@@ -303,6 +303,8 @@ def AssureGeomPublished(mesh, geom, name=''):
     """
     Private method. Add geom (sub-shape of the main shape) into the study if not yet there
     """
     """
     Private method. Add geom (sub-shape of the main shape) into the study if not yet there
     """

+    if not mesh.smeshpyD.IsEnablePublish():
+        return

     if not isinstance( geom, geomBuilder.GEOM._objref_GEOM_Object ):
         return
     if not geom.GetStudyEntry():
     if not isinstance( geom, geomBuilder.GEOM._objref_GEOM_Object ):
         return
     if not geom.GetStudyEntry():