From 7f7d121f90547b5e33469a36d72808392047765e Mon Sep 17 00:00:00 2001
From: emv <emv@opencascade.com>
Date: Thu, 20 Jun 2019 11:33:14 +0300
Subject: [PATCH] 0030786: BOP Cut: artifacts with enabled nondestructive flag

Avoid PaveBlocks initialization on vertex update.
Test case for the issue.
---
 src/BOPAlgo/BOPAlgo_PaveFiller_10.cxx |  2 --
 src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx  |  1 +
 tests/bugs/modalg_7/bug30786          | 31 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 tests/bugs/modalg_7/bug30786

diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_10.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_10.cxx
index d752c73ef3..b5c9eff0a5 100644
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_10.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_10.cxx
@@ -152,8 +152,6 @@ Standard_Integer BOPAlgo_PaveFiller::UpdateVertex
   //
   // add vertex to SD map
   myDS->AddShapeSD(nV, nVNew);
-  //
-  myDS->InitPaveBlocksForVertex(nV);
 
   // Add new vertex to map of vertices to avoid further extension
   myVertsToAvoidExtension.Add(nVNew);
diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
index 7dad175ea6..e5689c50c9 100644
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
@@ -3250,6 +3250,7 @@ void BOPAlgo_PaveFiller::UpdateBlocksWithSharedVertices()
         aTolV=BRep_Tool::Tolerance(aV);
         //
         UpdateVertex(nV, aTolV);
+        myDS->InitPaveBlocksForVertex (nV);
       }
     }//for (j=0; j<aNbC; ++j) {
   }//for (i=0; i<aNbFF; ++i) {
diff --git a/tests/bugs/modalg_7/bug30786 b/tests/bugs/modalg_7/bug30786
new file mode 100644
index 0000000000..1461c7d95b
--- /dev/null
+++ b/tests/bugs/modalg_7/bug30786
@@ -0,0 +1,31 @@
+puts "========"
+puts "0030786: BOP Cut: artifacts with enabled nondestructive flag"
+puts "========"
+puts ""
+
+restore [locate_data_file bug30786_Corner_Shapes.brep] s
+explode s
+
+bnondestructive 1
+bclearobjects
+bcleartools
+baddobjects s_1
+baddtools s_2 s_3 s_4
+bfillds
+bbop result 2
+
+bnondestructive 0
+bclearobjects
+bcleartools
+baddobjects s_1
+baddtools s_2 s_3 s_4
+bfillds
+bbop result1 2
+
+foreach r {result result1} {
+  checkshape $r
+  checknbshapes $r -wire 32 -face 32 -shell 2 -solid 2
+  checkprops $r -s 277739 -v 543086
+}
+
+checkview -display result -2d -path ${imagedir}/${test_image}.png