]> SALOME platform Git repositories - plugins/hybridplugin.git/commitdiff
Salome HOME
Windows compatibility.
authorrnv <rnv@opencascade.com>
Tue, 4 Apr 2017 10:51:41 +0000 (13:51 +0300)
committerrnv <rnv@opencascade.com>
Tue, 4 Apr 2017 10:51:41 +0000 (13:51 +0300)
src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx

index dfaee8bf97f65184a486fdbfca655456da798e19..c477cbe76e8b9c8d4975d70811c28bbd069e2da0 100644 (file)
@@ -609,7 +609,7 @@ static bool readGMFFile(MG_HYBRID_API*                          MGOutput,
           if (fullyCreatedElement) {
             aCreatedElem = theHelper->AddFace( node[0], node[1], node[2], noID, force3d );
             // add iElem < aFaceGroupByHybridId.size() to avoid crash if imprinting with hexa core with MeshGems <= 2.4-5
-            if ( !aFaceGroupByHybridId.empty() and iElem < aFaceGroupByHybridId.size() and !aFaceGroupByHybridId[iElem].empty() ) {
+            if ( !aFaceGroupByHybridId.empty() && iElem < aFaceGroupByHybridId.size() && !aFaceGroupByHybridId[iElem].empty() ) {
               addElemInMeshGroup(theHelper->GetMesh(), aCreatedElem, aFaceGroupByHybridId[iElem], groupsToRemove);
             }
             // add element in shape for groups on geom to work