diff options
Diffstat (limited to 'extern/mantaflow/helper/pwrapper/numpyWrap.cpp')
-rw-r--r-- | extern/mantaflow/helper/pwrapper/numpyWrap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/mantaflow/helper/pwrapper/numpyWrap.cpp b/extern/mantaflow/helper/pwrapper/numpyWrap.cpp index d2ddb21be70..0e2ef3f4803 100644 --- a/extern/mantaflow/helper/pwrapper/numpyWrap.cpp +++ b/extern/mantaflow/helper/pwrapper/numpyWrap.cpp @@ -94,7 +94,7 @@ void PyArrayContainer::ExtractData(void *_pParentPyArray) template<> PyArrayContainer fromPy<PyArrayContainer>(PyObject *obj) { - if (PyArray_API == NULL) { + if (PyArray_API == nullptr) { // python 3 uses the return value #if PY_VERSION_HEX >= 0x03000000 import_array(); @@ -109,12 +109,12 @@ template<> PyArrayContainer fromPy<PyArrayContainer>(PyObject *obj) PyArrayObject *obj_p = reinterpret_cast<PyArrayObject *>( PyArray_CheckFromAny(obj, - NULL, + nullptr, 0, 0, /*NPY_ARRAY_ENSURECOPY*/ NPY_ARRAY_C_CONTIGUOUS | NPY_ARRAY_ENSUREARRAY | NPY_ARRAY_NOTSWAPPED, - NULL)); + nullptr)); PyArrayContainer container = PyArrayContainer(obj_p); return container; |