From a9219e5f12182c6fa74f609710408281585f4ef1 Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Fri, 11 Mar 2022 14:46:25 +0300
Subject: [PATCH] bos #29266 EDF 24971 - SALOME crashes

fix crash, meshing failure still there
---
 src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
index 029d94728..c466e390e 100644
--- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
+++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
@@ -1512,9 +1512,9 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
             double ang2 = fabs(VN2.Angle(VI2));
             double coef1 = 0.5 - (( ang1 < M_PI/3. ) ? cos(ang1)*0.25 : 0 );
             double coef2 = 0.5 - (( ang2 < M_PI/3. ) ? cos(ang2)*0.25 : 0 ); // cos(ang2) ?
-//             double coef2 = 0.5;
-//             if(ang2<PI/3)
-//               coef2 -= cos(ang1)*0.25;
+            //             double coef2 = 0.5;
+            //             if(ang2<PI/3)
+            //               coef2 -= cos(ang1)*0.25;
 
             VN1.Scale(coef1);
             VN2.Scale(coef2);
@@ -1529,9 +1529,11 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
           MergeAdjacent( PrmI, nodesToMove );
           MergeAdjacent( PrmJ, nodesToMove );
 
+          apexI = PrmI->GetNode( PYRAM_APEX ); // apexI can be removed by merge
+
         } // end if(hasInt)
-      } // loop on suspectPyrams
-    }  // loop on 4 base nodes of PrmI
+      } // loop on 4 base nodes of PrmI
+    }  // loop on suspectPyrams
 
   } // loop on all pyramids
 
-- 
2.30.2