Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-07-17 17:11:21 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-07-17 17:11:21 +0300
commit893eb30730c14d0040f5484958289e8fe1d3c4b2 (patch)
tree079bc58a3fa889fb61522cf380bcbb1aea066ef7 /extern/mantaflow/UPDATE.sh
parent0cdc75ccd28c607677c302014cd40df542d85d35 (diff)
Fluid: Numpy support for Mantaflow build system
Adjusted the fluid build system so that plugins that depend on numpy can be compiled as well. Note that in this commit numpy support is still disabled. It can be enabled by re-running the Mantaflow update script with USE_NUMPY=1 and enabling WITH_MANTA_NUMPY in extern/mantaflow/CMakeLists.txt. This will happen in a future commit.
Diffstat (limited to 'extern/mantaflow/UPDATE.sh')
-rw-r--r--extern/mantaflow/UPDATE.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/extern/mantaflow/UPDATE.sh b/extern/mantaflow/UPDATE.sh
index 62395fde7cd..aed4e2a9b71 100644
--- a/extern/mantaflow/UPDATE.sh
+++ b/extern/mantaflow/UPDATE.sh
@@ -16,6 +16,9 @@ CLEAN_REPOSITORY=0
# Skip copying dependency files?
WITH_DEPENDENCIES=0
+# Build with numpy support?
+USE_NUMPY=0
+
# Choose which multithreading platform to use for Mantaflow preprocessing
USE_OMP=0
USE_TBB=1
@@ -53,7 +56,7 @@ fi
MANTA_BUILD_PATH=$MANTA_INSTALLATION/build_blender/
mkdir -p $MANTA_BUILD_PATH
cd $MANTA_BUILD_PATH
-cmake ../mantaflowgit -DGUI=0 -DOPENMP=$USE_OMP -DTBB=$USE_TBB -DBLENDER=1 -DPREPDEBUG=1 && make -j8
+cmake ../mantaflowgit -DGUI=0 -DOPENMP=$USE_OMP -DTBB=$USE_TBB -DBLENDER=1 -DPREPDEBUG=1 -DNUMPY=$USE_NUMPY && make -j8
# ==================== 3) COPY MANTAFLOW FILES TO BLENDER ROOT ===========================