Always call UnifySameDomain on + operator not only in 2D

This commit is contained in:
Christopher Lackner 2021-10-05 10:46:55 +02:00
parent eab9cb4b5c
commit a2ee528dae

View File

@ -942,13 +942,13 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
// make one face when fusing in 2D // make one face when fusing in 2D
// from https://gitlab.onelab.info/gmsh/gmsh/-/issues/627 // from https://gitlab.onelab.info/gmsh/gmsh/-/issues/627
int cntsolid = 0; // int cntsolid = 0;
for (TopExp_Explorer e(shape1, TopAbs_SOLID); e.More(); e.Next()) // for (TopExp_Explorer e(shape1, TopAbs_SOLID); e.More(); e.Next())
cntsolid++; // cntsolid++;
for (TopExp_Explorer e(shape2, TopAbs_SOLID); e.More(); e.Next()) // for (TopExp_Explorer e(shape2, TopAbs_SOLID); e.More(); e.Next())
cntsolid++; // cntsolid++;
if (cntsolid == 0) // if (cntsolid == 0)
{ // {
ShapeUpgrade_UnifySameDomain unify(fused, true, true, true); ShapeUpgrade_UnifySameDomain unify(fused, true, true, true);
unify.Build(); unify.Build();
@ -966,9 +966,9 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
// PropagateProperties (unify, fused); // PropagateProperties (unify, fused);
return unify.Shape(); return unify.Shape();
} // }
else // else
return fused; // return fused;
}, "fuses shapes") }, "fuses shapes")
.def("__radd__", [] (const TopoDS_Shape & shape, int i) // for sum([shapes]) .def("__radd__", [] (const TopoDS_Shape & shape, int i) // for sum([shapes])
{ return shape; }, "needed for Sum([shapes])") { return shape; }, "needed for Sum([shapes])")