1 files changed, 6 insertions, 6 deletions

diff --git a/extern/mantaflow/helper/pwrapper/pconvert.cpp b/extern/mantaflow/helper/pwrapper/pconvert.cpp
index 861a2c070bd..7c66cdc7e72 100644
--- a/extern/mantaflow/helper/pwrapper/pconvert.cpp
+++ b/extern/mantaflow/helper/pwrapper/pconvert.cpp
@@ -491,7 +491,7 @@ template<> bool isPy<std::vector<float>>(PyObject *obj)
 //******************************************************************************
 // PbArgs class defs
 
-PbArgs PbArgs::EMPTY(NULL, NULL);
+PbArgs PbArgs::EMPTY(nullptr, nullptr);
 
 PbArgs::PbArgs(PyObject *linarg, PyObject *dict) : mLinArgs(0), mKwds(0)
 {
@@ -577,7 +577,7 @@ void PbArgs::check()
 
 FluidSolver *PbArgs::obtainParent()
 {
-  FluidSolver *solver = getPtrOpt<FluidSolver>("solver", -1, NULL);
+  FluidSolver *solver = getPtrOpt<FluidSolver>("solver", -1, nullptr);
   if (solver != 0)
     return solver;
 
@@ -585,7 +585,7 @@ FluidSolver *PbArgs::obtainParent()
     PbClass *obj = Pb::objFromPy(it->second.obj);
 
     if (obj) {
-      if (solver == NULL)
+      if (solver == nullptr)
         solver = obj->getParent();
     }
   }
@@ -593,7 +593,7 @@ FluidSolver *PbArgs::obtainParent()
     PbClass *obj = Pb::objFromPy(it->obj);
 
     if (obj) {
-      if (solver == NULL)
+      if (solver == nullptr)
         solver = obj->getParent();
     }
   }
@@ -616,7 +616,7 @@ PyObject *PbArgs::getItem(const std::string &key, bool strict, ArgLocker *lk)
   if (lu == mData.end()) {
     if (strict)
       errMsg("Argument '" + key + "' is not defined.");
-    return NULL;
+    return nullptr;
   }
   PbClass *pbo = Pb::objFromPy(lu->second.obj);
   // try to lock
@@ -629,7 +629,7 @@ PyObject *PbArgs::getItem(size_t number, bool strict, ArgLocker *lk)
 {
   if (number >= mLinData.size()) {
     if (!strict)
-      return NULL;
+      return nullptr;
     stringstream s;
     s << "Argument number #" << number << " not specified.";
     errMsg(s.str());