diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-02-07 17:21:26 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-02-07 17:21:26 +0300 |
commit | 1a93bc2db874b10054ad2814dff5705ce751963a (patch) | |
tree | 3f6938c26f43c66ecf4fea0fe20ea35443a85109 | |
parent | 6f3e498e7d5e0c772ef795e7301dd332bccada22 (diff) | |
parent | ffcccf654c8e05f464c59fad82404833160f5b85 (diff) |
Merge branch 'blender-v2.82-release'
-rw-r--r-- | intern/mantaflow/intern/MANTA_main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp index c0c7ef5dbf2..2cbf058d8de 100644 --- a/intern/mantaflow/intern/MANTA_main.cpp +++ b/intern/mantaflow/intern/MANTA_main.cpp @@ -2798,8 +2798,10 @@ int MANTA::updateGridFromFile(const char *filename, float *grid) if (extension.compare("uni") == 0) return updateGridFromUni(filename, grid); +#ifdef WITH_OPENVDB else if (extension.compare("vdb") == 0) return updateGridFromVDB(filename, grid); +#endif else if (extension.compare("raw") == 0) return updateGridFromRaw(filename, grid); else @@ -2884,6 +2886,7 @@ int MANTA::updateGridFromUni(const char *filename, float *grid) return 1; } +#ifdef WITH_OPENVDB int MANTA::updateGridFromVDB(const char *filename, float *grid) { if (with_debug) @@ -2922,6 +2925,7 @@ int MANTA::updateGridFromVDB(const char *filename, float *grid) } return 1; } +#endif int MANTA::updateGridFromRaw(const char *filename, float *grid) { |