kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Import: replace PyObject_IsTrue with Base::asBoolean

Browse Source
This commit is contained in:
wmayer
2022-07-16 13:37:12 +02:00
parent aea58ace37
commit 76330db700
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Import/App/AppImportPy.cpp
View File

@@ -239,11 +239,11 @@ private:
#if 1
ImportOCAFExt ocaf(hDoc, pcDoc, file.fileNamePure());
if (merge != Py_None)
ocaf.setMerge(PyObject_IsTrue(merge) ? true : false);
ocaf.setMerge(Base::asBoolean(merge));
if (importHidden != Py_None)
ocaf.setImportHiddenObject(PyObject_IsTrue(importHidden) ? true : false);
ocaf.setImportHiddenObject(Base::asBoolean(importHidden));
if (useLinkGroup != Py_None)
ocaf.setUseLinkGroup(PyObject_IsTrue(useLinkGroup) ? true : false);
ocaf.setUseLinkGroup(Base::asBoolean(useLinkGroup));
if (mode >= 0)
ocaf.setMode(mode);
ocaf.loadShapes();
@@ -320,11 +320,11 @@ private:
}
Import::ExportOCAF2 ocaf(hDoc);
if ((PyObject_IsTrue(legacy)? false : true) || !ocaf.canFallback(objs)) {
if (!Base::asBoolean(legacy) || !ocaf.canFallback(objs)) {
if (exportHidden != Py_None)
ocaf.setExportHiddenObject(PyObject_IsTrue(exportHidden) ? true : false);
ocaf.setExportHiddenObject(Base::asBoolean(exportHidden));
if (keepPlacement != Py_None)
ocaf.setKeepPlacement(PyObject_IsTrue(keepPlacement) ? true : false);
ocaf.setKeepPlacement(Base::asBoolean(keepPlacement));
ocaf.exportObjects(objs);
}
else {