diff options
author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
---|---|---|
committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
tree | 0cbb1b91fe26c750197126085b74224a795a103c /extern/mantaflow/helper/pwrapper/registry.h | |
parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'extern/mantaflow/helper/pwrapper/registry.h')
-rw-r--r-- | extern/mantaflow/helper/pwrapper/registry.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extern/mantaflow/helper/pwrapper/registry.h b/extern/mantaflow/helper/pwrapper/registry.h index d9d2bbb624b..2273d0b9bb1 100644 --- a/extern/mantaflow/helper/pwrapper/registry.h +++ b/extern/mantaflow/helper/pwrapper/registry.h @@ -48,8 +48,11 @@ template<class T> struct Namify { namespace Pb { // internal registry access -void setup(const std::string &filename, const std::vector<std::string> &args); -void finalize(); +void setup(bool python_lifecycle, + const std::string &filename, + const std::vector<std::string> &args, + PyObject *name_space); +void finalize(bool python_lifecycle); bool canConvert(PyObject *obj, const std::string &to); Manta::PbClass *objFromPy(PyObject *obj); Manta::PbClass *createPy(const std::string &classname, |