Regression SALOME_TESTS/Grids/smesh/mesh_BLSURF_01/B6

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 73ac53225f91321aabff8f29c81a2510be761b1b..655aa9cb5a5a3632ac2ca896f30785b86e599b1b 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -951,7 +951,7 @@ void BLSURFPlugin_BLSURF::SetParameters(const BLSURFPlugin_Hypothesis* hyp,
 
   if ( BLSURFPlugin_Hypothesis::HasPreCADOptions( hyp ))
   {
-    cadsurf_set_param(css, "use_precad", "yes" ); // for young versions
+    cadsurf_set_param(css, "use_precad", "yes" ); // for old versions
   }
   // PreProcessor (formerly PreCAD) -- commented params are preCADoptions (since 0023307)
   //set_param(css, "merge_edges",            _precadMergeEdges ? "yes" : "no");

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
index 745c2272ccb575e300db7a5405e5f7a927f3cd11..5e8c8cd43937bc5813990447d7c51dc2fed92dbb 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
@@ -749,7 +749,13 @@ bool BLSURFPlugin_Hypothesis::HasPreCADOptions(const BLSURFPlugin_Hypothesis* hy
            ToBool( hyp->GetPreCADOptionValue("remove_duplicate_cad_faces", &orDefault )) ||
            ToBool( hyp->GetPreCADOptionValue("process_3d_topology"       , &orDefault )) ||
            ToBool( hyp->GetPreCADOption     ("manifold_geometry")        , &isOk       ) ||
-           hyp->GetPreCADOptionValue("sewing_tolerance", &orDefault ) != "5e-4*D" );
+           hyp->GetPreCADOptionValue("sewing_tolerance", &orDefault ) != "5e-4*D"        ||
+           !hyp->_preCadFacesPeriodicityVector.empty()                                   ||
+           !hyp->_preCadEdgesPeriodicityVector.empty()                                   ||
+           !hyp->_facesPeriodicityVector.empty()                                         ||
+           !hyp->_edgesPeriodicityVector.empty()                                         ||
+           !hyp->_verticesPeriodicityVector.empty()                                      ||
+           hyp->GetTopology() != FromCAD );
 }
 
 //=============================================================================