53061: "Clear mesh data" removes too many (if !HasShapeToMesh())

diff --git a/doc/salome/gui/SMESH/input/about_meshes.doc b/doc/salome/gui/SMESH/input/about_meshes.doc
index 9d92487c510fd12b36fbd3e8602e0731f1026556..621a47e990cd5cb5febd22133da91b94cdafbd3d 100644 (file)
--- a/doc/salome/gui/SMESH/input/about_meshes.doc
+++ b/doc/salome/gui/SMESH/input/about_meshes.doc
@@ -110,9 +110,10 @@ SALOME supports elements of second order, without a central node
 (quadratic triangle, quadrangle, polygon, tetrahedron, hexahedron,
 pentahedron and pyramid) and with central nodes (bi-quadratic triangle
 and quadrangle and tri-quadratic hexahedron).<br>
 (quadratic triangle, quadrangle, polygon, tetrahedron, hexahedron,
 pentahedron and pyramid) and with central nodes (bi-quadratic triangle
 and quadrangle and tri-quadratic hexahedron).<br>

-Quadratic mesh can be obtained in two ways:
+Quadratic mesh can be obtained in three ways:

 - Using a global \ref quadratic_mesh_anchor "Quadratic Mesh"
 hypothesis. (Elements with the central node are not generated in this way).
 - Using \ref convert_to_from_quadratic_mesh_page operation.
 - Using a global \ref quadratic_mesh_anchor "Quadratic Mesh"
 hypothesis. (Elements with the central node are not generated in this way).
 - Using \ref convert_to_from_quadratic_mesh_page operation.

-
+- Using an appropriate option of some meshing algorithms, which
+generate elements of several dimensions starting from mesh segments.

 */
 */

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index 728a75ddb8ee179295e70d97e17a5fff2a4e54ff..b025573b9b559add0fb7ed705d7ffc70251e04ef 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -293,7 +293,7 @@ void SMESH_Mesh_i::Clear() throw (SALOME::SALOME_Exception)
 {
   Unexpect aCatch(SALOME_SalomeException);
   if ( _preMeshInfo )
 {
   Unexpect aCatch(SALOME_SalomeException);
   if ( _preMeshInfo )

-    _preMeshInfo->ForgetAllData();
+    _preMeshInfo->ForgetOrLoad(); // load in case if !HasShapeToMesh()

 
   try {
     _impl->Clear();
 
   try {
     _impl->Clear();