[Bf-blender-cvs] [ffcccf654c8] blender-v2.82-release: OpenVDB: Added missing macros in fluid wrapper file

Sebastián Barschkis noreply at git.blender.org
Fri Feb 7 15:20:14 CET 2020


Commit: ffcccf654c8e05f464c59fad82404833160f5b85
Author: Sebastián Barschkis
Date:   Fri Feb 7 15:19:17 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBffcccf654c8e05f464c59fad82404833160f5b85

OpenVDB: Added missing macros in fluid wrapper file

These were needed to compile when WITH_FLUID=1 and WITH_OPENVDB=0.

===================================================================

M	intern/mantaflow/intern/MANTA_main.cpp

===================================================================

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)
 {



More information about the Bf-blender-cvs mailing list