From: vsr <vsr@opencascade.com>
Date: Fri, 5 Feb 2016 14:25:24 +0000 (+0300)
Subject: Merge remote branch 'origin/V7_dev' into V8_0_0_BR
X-Git-Tag: V8_0_0rc1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ee0738fe562f847342b7723db6fa4488f1865fd2;hp=0aa1e7419aa1b35b6096fd3aaf8dc559db3e28d0;p=modules%2Fsmesh.git

Merge remote branch 'origin/V7_dev' into V8_0_0_BR
---

diff --git a/doc/salome/gui/SMESH/input/about_meshes.doc b/doc/salome/gui/SMESH/input/about_meshes.doc
index 9d92487c5..621a47e99 100644
--- 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 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 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 728a75ddb..b025573b9 100644
--- 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 )
-    _preMeshInfo->ForgetAllData();
+    _preMeshInfo->ForgetOrLoad(); // load in case if !HasShapeToMesh()
 
   try {
     _impl->Clear();