diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp index c39f5a3d54..e24949b7fd 100644 --- a/src/Mod/Mesh/App/MeshPyImp.cpp +++ b/src/Mod/Mesh/App/MeshPyImp.cpp @@ -408,7 +408,7 @@ PyObject* MeshPy::crossSections(PyObject *args) } std::vector sections; - getMeshObjectPtr()->crossSections(csPlanes, sections, min_eps, PyObject_IsTrue(poly) ? true : false); + getMeshObjectPtr()->crossSections(csPlanes, sections, min_eps, Base::asBoolean(poly)); // convert to Python objects Py::List crossSections; @@ -525,7 +525,7 @@ PyObject* MeshPy::section(PyObject *args, PyObject *kwds) MeshPy* pcObject = static_cast(pcObj); - std::vector< std::vector > curves = getMeshObjectPtr()->section(*pcObject->getMeshObjectPtr(), PyObject_IsTrue(connectLines) ? true : false, fMinDist); + std::vector< std::vector > curves = getMeshObjectPtr()->section(*pcObject->getMeshObjectPtr(), Base::asBoolean(connectLines), fMinDist); Py::List outer; for (const auto& it : curves) { Py::List inner; @@ -739,7 +739,7 @@ PyObject* MeshPy::addFacets(PyObject *args) faces.push_back(face); } - getMeshObjectPtr()->addFacets(faces, vertices, PyObject_IsTrue(check) ? true : false); + getMeshObjectPtr()->addFacets(faces, vertices, Base::asBoolean(check)); Py_Return; } @@ -1152,7 +1152,7 @@ PyObject* MeshPy::removePointsOnEdge(PyObject *args, PyObject *kwds) if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", keywords, &PyBool_Type, &fillBoundary)) return nullptr; try { - getMeshObjectPtr()->removePointsOnEdge(PyObject_IsTrue(fillBoundary) ? true : false); + getMeshObjectPtr()->removePointsOnEdge(Base::asBoolean(fillBoundary)); } catch (const Base::Exception& e) { e.setPyException(); diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp index 041cabea31..c221a93073 100644 --- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp +++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp @@ -495,8 +495,8 @@ private: mesher.setDeflection(lindeflection); mesher.setAngularDeflection(angdeflection); mesher.setRegular(true); - mesher.setRelative(PyObject_IsTrue(relative) ? true : false); - mesher.setSegments(PyObject_IsTrue(segment) ? true : false); + mesher.setRelative(Base::asBoolean(relative)); + mesher.setSegments(Base::asBoolean(segment)); if (groupColors) { Py::Sequence list(groupColors); std::vector colors;