diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-06-14 13:44:13 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-06-14 13:44:13 +0300 |
| commit | dddcf1e9bbf4a6d1f4ff03eaf0cb7e9228b18ec5 (patch) | |
| tree | c20defa7efd54c933d20a296abefe567909bb6c0 /extern/mantaflow/preprocessed/grid4d.h | |
| parent | 3b162b7c185d089e93d892169a458d552196b7b6 (diff) | |
| parent | c9dc55301cd7903b7ef7c045d337ada29aa809a1 (diff) | |
Merge branch 'master' into temp-compact-node-prototypetemp-compact-node-prototype
Diffstat (limited to 'extern/mantaflow/preprocessed/grid4d.h')
| -rw-r--r-- | extern/mantaflow/preprocessed/grid4d.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extern/mantaflow/preprocessed/grid4d.h b/extern/mantaflow/preprocessed/grid4d.h index 9b64116fc9d..1741db590b7 100644 --- a/extern/mantaflow/preprocessed/grid4d.h +++ b/extern/mantaflow/preprocessed/grid4d.h @@ -326,6 +326,7 @@ class Grid4dBase : public PbClass { // precomputed Z,T shift: to ensure 2D compatibility, always use this instead of sx*sy ! IndexInt mStrideZ; IndexInt mStrideT; + public: PbArgs _args; } @@ -950,6 +951,7 @@ template<class T> class Grid4d : public Grid4dBase { protected: T *mData; + public: PbArgs _args; } |