1ea89c82d4
It's better for performance to use a single thread pool for all areas of Blender, and this gets us closer to that. Bullet, Quadriflow, Mantaflow and Ceres still contain OpenMP code, but it was already disabled. On macOS, our OpenMP libraries are no longer compatible with the latest Xcode 16.3. By removing OpenMP we no longer have to solve that problem. OpenMP was disabled for bpy module builds on Windows ARM64, which also no longer needs to be solved. Pull Request: https://projects.blender.org/blender/blender/pulls/136865
97 lines
3.8 KiB
Bash
97 lines
3.8 KiB
Bash
#!/bin/bash
|
|
#
|
|
# ========================================================================================
|
|
# UPDATING MANTAFLOW INSIDE BLENDER
|
|
# ========================================================================================
|
|
|
|
# ==================== 1) ENVIRONMENT SETUP =============================================
|
|
|
|
# YOUR INSTALLATION PATHS GO HERE:
|
|
MANTA_INSTALLATION=/Users/sebbas/Developer/Mantaflow/mantaflowDevelop
|
|
BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender
|
|
|
|
# Try to check out Mantaflow repository before building?
|
|
CLEAN_REPOSITORY=0
|
|
|
|
# Skip copying dependency files?
|
|
WITH_DEPENDENCIES=0
|
|
|
|
# Build with numpy support?
|
|
USE_NUMPY=0
|
|
|
|
# ==================== 2) BUILD MANTAFLOW ================================================
|
|
|
|
cd $MANTA_INSTALLATION
|
|
|
|
# Check-out manta repo from git?
|
|
if [[ "$CLEAN_REPOSITORY" -eq "1" ]]; then
|
|
if cd mantaflowgit/; then git pull; else
|
|
git clone git@bitbucket.org:thunil/mantaflowgit.git
|
|
cd mantaflowgit
|
|
fi
|
|
git checkout develop
|
|
fi
|
|
|
|
MANTA_BUILD_PATH=$MANTA_INSTALLATION/build_blender/
|
|
mkdir -p $MANTA_BUILD_PATH
|
|
cd $MANTA_BUILD_PATH
|
|
cmake ../mantaflowgit -DGUI=0 -DOPENMP=0 -DTBB=1 -DBLENDER=1 -DPREPDEBUG=1 -DNUMPY=$USE_NUMPY && make -j8
|
|
|
|
# ==================== 3) COPY MANTAFLOW FILES TO BLENDER ROOT ===========================
|
|
|
|
if [[ "$WITH_DEPENDENCIES" -eq "1" ]]; then
|
|
mkdir -p $BLENDER_INSTALLATION/blender/tmp/dependencies/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/dependencies/cnpy "$_"
|
|
fi
|
|
mkdir -p $BLENDER_INSTALLATION/blender/tmp/helper/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/source/util "$_"
|
|
mkdir -p $BLENDER_INSTALLATION/blender/tmp/helper/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/source/pwrapper "$_"
|
|
mkdir -p $BLENDER_INSTALLATION/blender/tmp/preprocessed/ && cp -Rf $MANTA_INSTALLATION/build_blender/pp/source/. "$_"
|
|
|
|
# Remove some files that are not need in Blender
|
|
if [[ "$WITH_DEPENDENCIES" -eq "1" ]]; then
|
|
rm $BLENDER_INSTALLATION/blender/tmp/dependencies/cnpy/example1.cpp
|
|
fi
|
|
rm $BLENDER_INSTALLATION/blender/tmp/helper/pwrapper/pymain.cpp
|
|
rm $BLENDER_INSTALLATION/blender/tmp/preprocessed/*.reg
|
|
rm $BLENDER_INSTALLATION/blender/tmp/preprocessed/python/*.reg
|
|
rm $BLENDER_INSTALLATION/blender/tmp/preprocessed/fileio/*.reg
|
|
|
|
# ==================== 4) CLANG-FORMAT ===================================================
|
|
|
|
cd $BLENDER_INSTALLATION/blender/tmp/
|
|
|
|
echo "Applying clang format to Mantaflow source files"
|
|
find . -iname *.h -o -iname *.cpp | xargs clang-format --verbose -i -style=file -sort-includes=0
|
|
find . -iname *.h -o -iname *.cpp | xargs dos2unix --verbose
|
|
|
|
# ==================== 5) MOVE MANTAFLOW FILES TO EXTERN/ ================================
|
|
|
|
BLENDER_MANTA_EXTERN=$BLENDER_INSTALLATION/blender/extern/mantaflow/
|
|
BLENDER_TMP=$BLENDER_INSTALLATION/blender/tmp
|
|
BLENDER_TMP_DEP=$BLENDER_TMP/dependencies
|
|
BLENDER_TMP_HLP=$BLENDER_TMP/helper
|
|
BLENDER_TMP_PP=$BLENDER_TMP/preprocessed
|
|
|
|
# Before moving new files, delete all existing file in the Blender repository
|
|
rm -Rf $BLENDER_MANTA_EXTERN/dependencies $BLENDER_MANTA_EXTERN/helper $BLENDER_MANTA_EXTERN/preprocessed
|
|
|
|
# Move files from tmp dir to extern/
|
|
if [[ "$WITH_DEPENDENCIES" -eq "1" ]]; then
|
|
cp -Rf $BLENDER_TMP_DEP $BLENDER_MANTA_EXTERN
|
|
fi
|
|
cp -Rf $BLENDER_TMP_HLP $BLENDER_MANTA_EXTERN
|
|
cp -Rf $BLENDER_TMP_PP $BLENDER_MANTA_EXTERN
|
|
|
|
# Copy the Mantaflow license and readme files as well
|
|
cp -Rf $MANTA_INSTALLATION/mantaflowgit/LICENSE $BLENDER_MANTA_EXTERN
|
|
cp -Rf $MANTA_INSTALLATION/mantaflowgit/README.md $BLENDER_MANTA_EXTERN
|
|
|
|
# Cleanup left over dir
|
|
rm -r $BLENDER_TMP
|
|
|
|
echo "Successfully copied new Mantaflow files to" $BLENDER_INSTALLATION/blender/extern/mantaflow/
|
|
|
|
# ==================== 6) CHECK CMAKE SETUP ==============================================
|
|
|
|
# Make sure that all files copied from Mantaflow are listed in intern/mantaflow/CMakeLists.txt
|
|
# Especially if new source files / plugins were added to Mantaflow.
|