[Bf-blender-cvs] [20933a1d443] fluid-mantaflow: Mantaflow: Updated build setup
Sebastián Barschkis
noreply at git.blender.org
Thu Nov 21 23:00:30 CET 2019
Commit: 20933a1d4439d35772aad6d04de8189349c42f50
Author: Sebastián Barschkis
Date: Thu Nov 21 23:00:22 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB20933a1d4439d35772aad6d04de8189349c42f50
Mantaflow: Updated build setup
Moved Manta source files to extern/ and adapted the updater script
===================================================================
M extern/CMakeLists.txt
A extern/mantaflow/CMakeLists.txt
A extern/mantaflow/LICENSE
A extern/mantaflow/README.md
A extern/mantaflow/UPDATE.sh
R100 intern/mantaflow/intern/manta_develop/dependencies/cnpy/LICENSE extern/mantaflow/dependencies/cnpy/LICENSE
R100 intern/mantaflow/intern/manta_develop/dependencies/cnpy/cnpy.cpp extern/mantaflow/dependencies/cnpy/cnpy.cpp
R099 intern/mantaflow/intern/manta_develop/dependencies/cnpy/cnpy.h extern/mantaflow/dependencies/cnpy/cnpy.h
R100 intern/mantaflow/intern/manta_develop/dependencies/cnpy/example1.cpp extern/mantaflow/dependencies/cnpy/example1.cpp
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/manta.h extern/mantaflow/helper/pwrapper/manta.h
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/numpyWrap.cpp extern/mantaflow/helper/pwrapper/numpyWrap.cpp
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/numpyWrap.h extern/mantaflow/helper/pwrapper/numpyWrap.h
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/pclass.cpp extern/mantaflow/helper/pwrapper/pclass.cpp
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/pclass.h extern/mantaflow/helper/pwrapper/pclass.h
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/pconvert.cpp extern/mantaflow/helper/pwrapper/pconvert.cpp
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/pconvert.h extern/mantaflow/helper/pwrapper/pconvert.h
R099 intern/mantaflow/intern/manta_develop/helper/pwrapper/pvec3.cpp extern/mantaflow/helper/pwrapper/pvec3.cpp
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/pymain.cpp extern/mantaflow/helper/pwrapper/pymain.cpp
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/pythonInclude.h extern/mantaflow/helper/pwrapper/pythonInclude.h
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/registry.cpp extern/mantaflow/helper/pwrapper/registry.cpp
R100 intern/mantaflow/intern/manta_develop/helper/pwrapper/registry.h extern/mantaflow/helper/pwrapper/registry.h
R100 intern/mantaflow/intern/manta_develop/helper/util/integrator.h extern/mantaflow/helper/util/integrator.h
R100 intern/mantaflow/intern/manta_develop/helper/util/interpol.h extern/mantaflow/helper/util/interpol.h
R100 intern/mantaflow/intern/manta_develop/helper/util/interpolHigh.h extern/mantaflow/helper/util/interpolHigh.h
R100 intern/mantaflow/intern/manta_develop/helper/util/matrixbase.h extern/mantaflow/helper/util/matrixbase.h
R100 intern/mantaflow/intern/manta_develop/helper/util/mcubes.h extern/mantaflow/helper/util/mcubes.h
R100 intern/mantaflow/intern/manta_develop/helper/util/quaternion.h extern/mantaflow/helper/util/quaternion.h
R100 intern/mantaflow/intern/manta_develop/helper/util/randomstream.h extern/mantaflow/helper/util/randomstream.h
R100 intern/mantaflow/intern/manta_develop/helper/util/rcmatrix.h extern/mantaflow/helper/util/rcmatrix.h
R100 intern/mantaflow/intern/manta_develop/helper/util/simpleimage.cpp extern/mantaflow/helper/util/simpleimage.cpp
R100 intern/mantaflow/intern/manta_develop/helper/util/simpleimage.h extern/mantaflow/helper/util/simpleimage.h
R100 intern/mantaflow/intern/manta_develop/helper/util/solvana.h extern/mantaflow/helper/util/solvana.h
R100 intern/mantaflow/intern/manta_develop/helper/util/vector4d.cpp extern/mantaflow/helper/util/vector4d.cpp
R100 intern/mantaflow/intern/manta_develop/helper/util/vector4d.h extern/mantaflow/helper/util/vector4d.h
R100 intern/mantaflow/intern/manta_develop/helper/util/vectorbase.cpp extern/mantaflow/helper/util/vectorbase.cpp
R100 intern/mantaflow/intern/manta_develop/helper/util/vectorbase.h extern/mantaflow/helper/util/vectorbase.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/commonkernels.h extern/mantaflow/preprocessed/commonkernels.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/commonkernels.h.reg extern/mantaflow/preprocessed/commonkernels.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/commonkernels.h.reg.cpp extern/mantaflow/preprocessed/commonkernels.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/conjugategrad.cpp extern/mantaflow/preprocessed/conjugategrad.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/conjugategrad.h extern/mantaflow/preprocessed/conjugategrad.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/conjugategrad.h.reg extern/mantaflow/preprocessed/conjugategrad.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/conjugategrad.h.reg.cpp extern/mantaflow/preprocessed/conjugategrad.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/edgecollapse.cpp extern/mantaflow/preprocessed/edgecollapse.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/edgecollapse.h extern/mantaflow/preprocessed/edgecollapse.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/edgecollapse.h.reg extern/mantaflow/preprocessed/edgecollapse.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/edgecollapse.h.reg.cpp extern/mantaflow/preprocessed/edgecollapse.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/fastmarch.cpp extern/mantaflow/preprocessed/fastmarch.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fastmarch.h extern/mantaflow/preprocessed/fastmarch.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fastmarch.h.reg extern/mantaflow/preprocessed/fastmarch.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fastmarch.h.reg.cpp extern/mantaflow/preprocessed/fastmarch.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/iogrids.cpp extern/mantaflow/preprocessed/fileio/iogrids.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/iomeshes.cpp extern/mantaflow/preprocessed/fileio/iomeshes.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/ioparticles.cpp extern/mantaflow/preprocessed/fileio/ioparticles.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/mantaio.h extern/mantaflow/preprocessed/fileio/mantaio.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/mantaio.h.reg extern/mantaflow/preprocessed/fileio/mantaio.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/mantaio.h.reg.cpp extern/mantaflow/preprocessed/fileio/mantaio.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fluidsolver.cpp extern/mantaflow/preprocessed/fluidsolver.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/fluidsolver.h extern/mantaflow/preprocessed/fluidsolver.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fluidsolver.h.reg extern/mantaflow/preprocessed/fluidsolver.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/fluidsolver.h.reg.cpp extern/mantaflow/preprocessed/fluidsolver.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/general.cpp extern/mantaflow/preprocessed/general.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/general.h extern/mantaflow/preprocessed/general.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/general.h.reg extern/mantaflow/preprocessed/general.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/general.h.reg.cpp extern/mantaflow/preprocessed/general.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/gitinfo.h extern/mantaflow/preprocessed/gitinfo.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid.cpp extern/mantaflow/preprocessed/grid.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid.h extern/mantaflow/preprocessed/grid.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/grid.h.reg extern/mantaflow/preprocessed/grid.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/grid.h.reg.cpp extern/mantaflow/preprocessed/grid.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid4d.cpp extern/mantaflow/preprocessed/grid4d.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid4d.h extern/mantaflow/preprocessed/grid4d.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/grid4d.h.reg extern/mantaflow/preprocessed/grid4d.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/grid4d.h.reg.cpp extern/mantaflow/preprocessed/grid4d.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/kernel.cpp extern/mantaflow/preprocessed/kernel.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/kernel.h extern/mantaflow/preprocessed/kernel.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/kernel.h.reg extern/mantaflow/preprocessed/kernel.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/kernel.h.reg.cpp extern/mantaflow/preprocessed/kernel.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/levelset.cpp extern/mantaflow/preprocessed/levelset.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/levelset.h extern/mantaflow/preprocessed/levelset.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/levelset.h.reg extern/mantaflow/preprocessed/levelset.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/levelset.h.reg.cpp extern/mantaflow/preprocessed/levelset.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/mesh.cpp extern/mantaflow/preprocessed/mesh.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/omp/mesh.h extern/mantaflow/preprocessed/mesh.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/mesh.h.reg extern/mantaflow/preprocessed/mesh.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/mesh.h.reg.cpp extern/mantaflow/preprocessed/mesh.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/movingobs.cpp extern/mantaflow/preprocessed/movingobs.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/movingobs.h extern/mantaflow/preprocessed/movingobs.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/movingobs.h.reg extern/mantaflow/preprocessed/movingobs.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/movingobs.h.reg.cpp extern/mantaflow/preprocessed/movingobs.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/multigrid.cpp extern/mantaflow/preprocessed/multigrid.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/multigrid.h extern/mantaflow/preprocessed/multigrid.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/multigrid.h.reg extern/mantaflow/preprocessed/multigrid.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/multigrid.h.reg.cpp extern/mantaflow/preprocessed/multigrid.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/noisefield.cpp extern/mantaflow/preprocessed/noisefield.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/noisefield.h extern/mantaflow/preprocessed/noisefield.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/noisefield.h.reg extern/mantaflow/preprocessed/noisefield.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/noisefield.h.reg.cpp extern/mantaflow/preprocessed/noisefield.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/particle.cpp extern/mantaflow/preprocessed/particle.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/particle.h extern/mantaflow/preprocessed/particle.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/particle.h.reg extern/mantaflow/preprocessed/particle.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/particle.h.reg.cpp extern/mantaflow/preprocessed/particle.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/advection.cpp extern/mantaflow/preprocessed/plugin/advection.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/apic.cpp extern/mantaflow/preprocessed/plugin/apic.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/extforces.cpp extern/mantaflow/preprocessed/plugin/extforces.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/fire.cpp extern/mantaflow/preprocessed/plugin/fire.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/flip.cpp extern/mantaflow/preprocessed/plugin/flip.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/fluidguiding.cpp extern/mantaflow/preprocessed/plugin/fluidguiding.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/initplugins.cpp extern/mantaflow/preprocessed/plugin/initplugins.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/kepsilon.cpp extern/mantaflow/preprocessed/plugin/kepsilon.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/meshplugins.cpp extern/mantaflow/preprocessed/plugin/meshplugins.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/pressure.cpp extern/mantaflow/preprocessed/plugin/pressure.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/ptsplugins.cpp extern/mantaflow/preprocessed/plugin/ptsplugins.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/secondaryparticles.cpp extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/surfaceturbulence.cpp extern/mantaflow/preprocessed/plugin/surfaceturbulence.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/vortexplugins.cpp extern/mantaflow/preprocessed/plugin/vortexplugins.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/waveletturbulence.cpp extern/mantaflow/preprocessed/plugin/waveletturbulence.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/waves.cpp extern/mantaflow/preprocessed/plugin/waves.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/python/defines.py extern/mantaflow/preprocessed/python/defines.py
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/python/defines.py.reg extern/mantaflow/preprocessed/python/defines.py.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/python/defines.py.reg.cpp extern/mantaflow/preprocessed/python/defines.py.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/registration.cpp extern/mantaflow/preprocessed/registration.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/shapes.cpp extern/mantaflow/preprocessed/shapes.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/omp/shapes.h extern/mantaflow/preprocessed/shapes.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/shapes.h.reg extern/mantaflow/preprocessed/shapes.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/shapes.h.reg.cpp extern/mantaflow/preprocessed/shapes.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/test.cpp extern/mantaflow/preprocessed/test.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/timing.cpp extern/mantaflow/preprocessed/timing.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/timing.h extern/mantaflow/preprocessed/timing.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/timing.h.reg extern/mantaflow/preprocessed/timing.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/timing.h.reg.cpp extern/mantaflow/preprocessed/timing.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/turbulencepart.cpp extern/mantaflow/preprocessed/turbulencepart.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/turbulencepart.h extern/mantaflow/preprocessed/turbulencepart.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/turbulencepart.h.reg extern/mantaflow/preprocessed/turbulencepart.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/turbulencepart.h.reg.cpp extern/mantaflow/preprocessed/turbulencepart.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexpart.cpp extern/mantaflow/preprocessed/vortexpart.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexpart.h extern/mantaflow/preprocessed/vortexpart.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexpart.h.reg extern/mantaflow/preprocessed/vortexpart.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexpart.h.reg.cpp extern/mantaflow/preprocessed/vortexpart.h.reg.cpp
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexsheet.cpp extern/mantaflow/preprocessed/vortexsheet.cpp
R099 intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexsheet.h extern/mantaflow/preprocessed/vortexsheet.h
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexsheet.h.reg extern/mantaflow/preprocessed/vortexsheet.h.reg
R100 intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexsheet.h.reg.cpp extern/mantaflow/preprocessed/vortexsheet.h.reg.cpp
M intern/mantaflow/CMakeLists.txt
D intern/mantaflow/intern/manta_develop/preprocessed/omp/commonkernels.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/conjugategrad.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/conjugategrad.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/fastmarch.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/fileio/iogrids.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/fluidsolver.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/grid.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/grid.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/grid4d.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/grid4d.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/levelset.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/levelset.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/mesh.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/movingobs.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/multigrid.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/noisefield.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/particle.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/particle.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/advection.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/apic.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/extforces.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/fire.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/flip.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/fluidguiding.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/initplugins.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/kepsilon.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/pressure.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/ptsplugins.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/secondaryparticles.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/sndparticles.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/surfaceturbulence.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/vortexplugins.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/waveletturbulence.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/plugin/waves.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/shapes.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/test.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/turbulencepart.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/turbulencepart.h
D intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexpart.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/omp/vortexpart.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/commonkernels.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/commonkernels.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/conjugategrad.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/conjugategrad.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/edgecollapse.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/edgecollapse.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/edgecollapse.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/edgecollapse.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fastmarch.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fastmarch.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fastmarch.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/iomeshes.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/ioparticles.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/mantaio.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/mantaio.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fileio/mantaio.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fluidsolver.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fluidsolver.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/fluidsolver.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/general.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/general.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/general.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/general.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/gitinfo.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid4d.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/grid4d.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/kernel.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/kernel.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/kernel.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/kernel.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/levelset.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/levelset.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/mesh.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/mesh.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/mesh.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/movingobs.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/movingobs.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/movingobs.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/multigrid.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/multigrid.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/multigrid.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/noisefield.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/noisefield.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/noisefield.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/particle.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/particle.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/meshplugins.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/plugin/sndparticles.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/python/defines.py
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/python/defines.py.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/python/defines.py.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/registration.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/shapes.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/shapes.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/shapes.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/timing.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/timing.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/timing.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/timing.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/turbulencepart.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/turbulencepart.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexpart.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexpart.h.reg.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexsheet.cpp
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexsheet.h
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexsheet.h.reg
D intern/mantaflow/intern/manta_develop/preprocessed/tbb/vortexsheet.h.reg.cpp
D intern/mantaflow/intern/manta_develop/update_mantaflow.sh
===================================================================
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 1952e418cfb..0da0ec83775 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -110,3 +110,7 @@ if(WITH_QUADRIFLOW)
set(QUADRIFLOW_CMAKE_CFG ${CMAKE_CURRENT_SOURCE_DIR}/quadriflow/blender_config.cmake)
add_subdirectory(quadriflow)
endif()
+
+if(WITH_MOD_MANTA)
+ add_subdirectory(mantaflow)
+endif()
diff --git a/intern/mantaflow/CMakeLists.txt b/extern/mantaflow/CMakeLists.txt
similarity index 90%
copy from intern/mantaflow/CMakeLists.txt
copy to extern/mantaflow/CMakeLists.txt
index 15268903dc1..ce92c4042fd 100644
--- a/intern/mantaflow/CMakeLists.txt
+++ b/extern/mantaflow/CMakeLists.txt
@@ -26,19 +26,16 @@
set(MANTAVERSION "0.12")
set(MANTA_DEP
- intern/manta_develop/dependencies
+ dependencies
)
set(MANTA_HLP
- intern/manta_develop/helper
+ helper
)
set(MANTA_PP
- intern/manta_develop/preprocessed/tbb
+ preprocessed
)
if(WITH_OPENMP AND WITH_MANTA_OMP)
- set(MANTA_PP
- intern/manta_develop/preprocessed/omp
- )
add_definitions(-DOPENMP=1)
else()
add_definitions(-DTBB=1)
@@ -49,8 +46,6 @@ if(WITH_OPENVDB)
endif()
set(INC
- extern
- intern/strings
${MANTA_PP}
${MANTA_PP}/fileio
${MANTA_PP}/python
@@ -58,13 +53,8 @@ set(INC
${MANTA_HLP}/pwrapper
${MANTA_HLP}/util
${MANTA_DEP}/cnpy
- ../../source/blender/makesdna
- ../../source/blender/blenlib
)
-# Python is always required
-add_definitions(-DWITH_PYTHON)
-
set(INC_SYS
${PYTHON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
@@ -85,17 +75,6 @@ if(WITH_OPENVDB)
endif()
set(SRC
- intern/manta_python_API.cpp
- intern/manta_fluid_API.cpp
- intern/MANTA_main.cpp
-
- extern/manta_python_API.h
- extern/manta_fluid_API.h
- intern/MANTA_main.h
- intern/strings/fluid_script.h
- intern/strings/smoke_script.h
- intern/strings/liquid_script.h
-
${MANTA_DEP}/cnpy/cnpy.cpp
${MANTA_DEP}/cnpy/cnpy.h
@@ -243,4 +222,4 @@ set(SRC
set(LIB
)
-blender_add_lib(bf_intern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(extern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/extern/mantaflow/LICENSE b/extern/mantaflow/LICENSE
new file mode 100644
index 00000000000..a5e3b509f7d
--- /dev/null
+++ b/extern/mantaflow/LICENSE
@@ -0,0 +1,222 @@
+
+Copyright 2018, the mantaflow team. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-------------------------------------------------------------------------
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+-------------------------------------------------------------------------
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothin
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list