diff options
author | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
---|---|---|
committer | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
commit | 97a4a8d0fb7fd9ac34f9f5d4d5a0689c01235e14 (patch) | |
tree | fc9746d2210eda08be9d44ae67d5e58d64b48b40 /extern/mantaflow/preprocessed/grid4d.h | |
parent | 4a7c203e9ecc7c5b0370afc0fdd6bcc183dc00df (diff) | |
parent | f3e8326453ae856d7914e45e832a2ed80aa9a9b9 (diff) |
merge
Diffstat (limited to 'extern/mantaflow/preprocessed/grid4d.h')
-rw-r--r-- | extern/mantaflow/preprocessed/grid4d.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/extern/mantaflow/preprocessed/grid4d.h b/extern/mantaflow/preprocessed/grid4d.h index c3a98788da3..ee36c681ec5 100644 --- a/extern/mantaflow/preprocessed/grid4d.h +++ b/extern/mantaflow/preprocessed/grid4d.h @@ -372,7 +372,7 @@ template<class T> class Grid4d : public Grid4dBase { typedef T BASETYPE; typedef Grid4dBase BASETYPE_GRID; - void save(std::string name); + int save(std::string name); static PyObject *_W_9(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { @@ -385,8 +385,7 @@ template<class T> class Grid4d : public Grid4dBase { ArgLocker _lock; std::string name = _args.get<std::string>("name", 0, &_lock); pbo->_args.copy(_args); - _retval = getPyNone(); - pbo->save(name); + _retval = toPy(pbo->save(name)); pbo->_args.check(); } pbFinalizePlugin(pbo->getParent(), "Grid4d::save", !noTiming); @@ -398,7 +397,7 @@ template<class T> class Grid4d : public Grid4dBase { } } - void load(std::string name); + int load(std::string name); static PyObject *_W_10(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { @@ -411,8 +410,7 @@ template<class T> class Grid4d : public Grid4dBase { ArgLocker _lock; std::string name = _args.get<std::string>("name", 0, &_lock); pbo->_args.copy(_args); - _retval = getPyNone(); - pbo->load(name); + _retval = toPy(pbo->load(name)); pbo->_args.check(); } pbFinalizePlugin(pbo->getParent(), "Grid4d::load", !noTiming); |