[Bf-blender-cvs] [5db51d2] fluid-mantaflow: updated manta files with linker fixes

Sebastián Barschkis noreply at git.blender.org
Thu Oct 20 17:45:00 CEST 2016


Commit: 5db51d21197a4499fbca07819b49daa415e0ccb2
Author: Sebastián Barschkis
Date:   Thu Oct 20 17:44:01 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB5db51d21197a4499fbca07819b49daa415e0ccb2

updated manta files with linker fixes

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

M	intern/mantaflow/CMakeLists.txt
M	intern/mantaflow/intern/manta_pp/commonkernels.h
M	intern/mantaflow/intern/manta_pp/commonkernels.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/conjugategrad.cpp
M	intern/mantaflow/intern/manta_pp/conjugategrad.h
M	intern/mantaflow/intern/manta_pp/conjugategrad.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/edgecollapse.cpp
M	intern/mantaflow/intern/manta_pp/edgecollapse.h
M	intern/mantaflow/intern/manta_pp/edgecollapse.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/fastmarch.cpp
M	intern/mantaflow/intern/manta_pp/fastmarch.h
M	intern/mantaflow/intern/manta_pp/fastmarch.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/fileio.cpp
M	intern/mantaflow/intern/manta_pp/fileio.h
M	intern/mantaflow/intern/manta_pp/fileio.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/fluidsolver.cpp
M	intern/mantaflow/intern/manta_pp/fluidsolver.h
M	intern/mantaflow/intern/manta_pp/fluidsolver.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/general.cpp
M	intern/mantaflow/intern/manta_pp/general.h
M	intern/mantaflow/intern/manta_pp/general.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/gitinfo.h
M	intern/mantaflow/intern/manta_pp/grid.cpp
M	intern/mantaflow/intern/manta_pp/grid.h
M	intern/mantaflow/intern/manta_pp/grid.h.reg
M	intern/mantaflow/intern/manta_pp/grid.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/grid4d.cpp
M	intern/mantaflow/intern/manta_pp/grid4d.h
M	intern/mantaflow/intern/manta_pp/grid4d.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/kernel.cpp
M	intern/mantaflow/intern/manta_pp/kernel.h
M	intern/mantaflow/intern/manta_pp/kernel.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/levelset.cpp
M	intern/mantaflow/intern/manta_pp/levelset.h
M	intern/mantaflow/intern/manta_pp/levelset.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/mesh.cpp
M	intern/mantaflow/intern/manta_pp/mesh.h
M	intern/mantaflow/intern/manta_pp/mesh.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/movingobs.cpp
M	intern/mantaflow/intern/manta_pp/movingobs.h
M	intern/mantaflow/intern/manta_pp/movingobs.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/noisefield.cpp
M	intern/mantaflow/intern/manta_pp/noisefield.h
M	intern/mantaflow/intern/manta_pp/noisefield.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/particle.cpp
M	intern/mantaflow/intern/manta_pp/particle.h
M	intern/mantaflow/intern/manta_pp/particle.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/plugin/advection.cpp
M	intern/mantaflow/intern/manta_pp/plugin/extforces.cpp
M	intern/mantaflow/intern/manta_pp/plugin/fire.cpp
M	intern/mantaflow/intern/manta_pp/plugin/flip.cpp
M	intern/mantaflow/intern/manta_pp/plugin/initplugins.cpp
M	intern/mantaflow/intern/manta_pp/plugin/kepsilon.cpp
M	intern/mantaflow/intern/manta_pp/plugin/meshplugins.cpp
M	intern/mantaflow/intern/manta_pp/plugin/pressure.cpp
M	intern/mantaflow/intern/manta_pp/plugin/surfaceturbulence.cpp
M	intern/mantaflow/intern/manta_pp/plugin/vortexplugins.cpp
M	intern/mantaflow/intern/manta_pp/plugin/waveletturbulence.cpp
M	intern/mantaflow/intern/manta_pp/plugin/waves.cpp
M	intern/mantaflow/intern/manta_pp/pwrapper/pclass.cpp
M	intern/mantaflow/intern/manta_pp/pwrapper/pclass.h
M	intern/mantaflow/intern/manta_pp/pwrapper/pythonInclude.h
M	intern/mantaflow/intern/manta_pp/pwrapper/registry.cpp
M	intern/mantaflow/intern/manta_pp/pwrapper/registry.h
M	intern/mantaflow/intern/manta_pp/python/defines.py.reg
M	intern/mantaflow/intern/manta_pp/python/defines.py.reg.cpp
A	intern/mantaflow/intern/manta_pp/registration.cpp
M	intern/mantaflow/intern/manta_pp/shapes.cpp
M	intern/mantaflow/intern/manta_pp/shapes.h
M	intern/mantaflow/intern/manta_pp/shapes.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/test.cpp
M	intern/mantaflow/intern/manta_pp/timing.cpp
M	intern/mantaflow/intern/manta_pp/timing.h
M	intern/mantaflow/intern/manta_pp/timing.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/turbulencepart.cpp
M	intern/mantaflow/intern/manta_pp/turbulencepart.h
M	intern/mantaflow/intern/manta_pp/turbulencepart.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/vortexpart.cpp
M	intern/mantaflow/intern/manta_pp/vortexpart.h
M	intern/mantaflow/intern/manta_pp/vortexpart.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/vortexsheet.cpp
M	intern/mantaflow/intern/manta_pp/vortexsheet.h
M	intern/mantaflow/intern/manta_pp/vortexsheet.h.reg.cpp

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

diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt
index 8810efe..4de347a 100644
--- a/intern/mantaflow/CMakeLists.txt
+++ b/intern/mantaflow/CMakeLists.txt
@@ -139,6 +139,7 @@ set(SRC
 	intern/manta_pp/python/defines.py
 	intern/manta_pp/python/defines.py.reg
 	intern/manta_pp/python/defines.py.reg.cpp
+	intern/manta_pp/registration.cpp
 	intern/manta_pp/shapes.cpp
 	intern/manta_pp/shapes.h
 	intern/manta_pp/shapes.h.reg
diff --git a/intern/mantaflow/intern/manta_pp/commonkernels.h b/intern/mantaflow/intern/manta_pp/commonkernels.h
index 4ed6efe..641eb3d 100644
--- a/intern/mantaflow/intern/manta_pp/commonkernels.h
+++ b/intern/mantaflow/intern/manta_pp/commonkernels.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/blenderIntegration/mantaflowgit/source/commonkernels.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/commonkernels.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/commonkernels.h.reg.cpp b/intern/mantaflow/intern/manta_pp/commonkernels.h.reg.cpp
index e69de29..c048757 100644
--- a/intern/mantaflow/intern/manta_pp/commonkernels.h.reg.cpp
+++ b/intern/mantaflow/intern/manta_pp/commonkernels.h.reg.cpp
@@ -0,0 +1,18 @@
+
+
+
+
+
+// DO NOT EDIT !
+// This file is generated using the MantaFlow preprocessor (prep link).
+
+
+
+
+#include "commonkernels.h"
+namespace Manta {
+extern "C" {
+void PbRegister_file_2()
+{
+}
+}}
\ No newline at end of file
diff --git a/intern/mantaflow/intern/manta_pp/conjugategrad.cpp b/intern/mantaflow/intern/manta_pp/conjugategrad.cpp
index 0713ab7..0702ba4 100644
--- a/intern/mantaflow/intern/manta_pp/conjugategrad.cpp
+++ b/intern/mantaflow/intern/manta_pp/conjugategrad.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/blenderIntegration/mantaflowgit/source/conjugategrad.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/conjugategrad.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/conjugategrad.h b/intern/mantaflow/intern/manta_pp/conjugategrad.h
index 4718b04..08e1ee3 100644
--- a/intern/mantaflow/intern/manta_pp/conjugategrad.h
+++ b/intern/mantaflow/intern/manta_pp/conjugategrad.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/blenderIntegration/mantaflowgit/source/conjugategrad.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/conjugategrad.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/conjugategrad.h.reg.cpp b/intern/mantaflow/intern/manta_pp/conjugategrad.h.reg.cpp
index e69de29..1f7a40c 100644
--- a/intern/mantaflow/intern/manta_pp/conjugategrad.h.reg.cpp
+++ b/intern/mantaflow/intern/manta_pp/conjugategrad.h.reg.cpp
@@ -0,0 +1,18 @@
+
+
+
+
+
+// DO NOT EDIT !
+// This file is generated using the MantaFlow preprocessor (prep link).
+
+
+
+
+#include "conjugategrad.h"
+namespace Manta {
+extern "C" {
+void PbRegister_file_3()
+{
+}
+}}
\ No newline at end of file
diff --git a/intern/mantaflow/intern/manta_pp/edgecollapse.cpp b/intern/mantaflow/intern/manta_pp/edgecollapse.cpp
index 3e12524..6332cfe 100644
--- a/intern/mantaflow/intern/manta_pp/edgecollapse.cpp
+++ b/intern/mantaflow/intern/manta_pp/edgecollapse.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/blenderIntegration/mantaflowgit/source/edgecollapse.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/edgecollapse.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/edgecollapse.h b/intern/mantaflow/intern/manta_pp/edgecollapse.h
index ee05c29..b97eae2 100644
--- a/intern/mantaflow/intern/manta_pp/edgecollapse.h
+++ b/intern/mantaflow/intern/manta_pp/edgecollapse.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/blenderIntegration/mantaflowgit/source/edgecollapse.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/edgecollapse.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/edgecollapse.h.reg.cpp b/intern/mantaflow/intern/manta_pp/edgecollapse.h.reg.cpp
index e69de29..f615087 100644
--- a/intern/mantaflow/intern/manta_pp/edgecollapse.h.reg.cpp
+++ b/intern/mantaflow/intern/manta_pp/edgecollapse.h.reg.cpp
@@ -0,0 +1,18 @@
+
+
+
+
+
+// DO NOT EDIT !
+// This file is generated using the MantaFlow preprocessor (prep link).
+
+
+
+
+#include "edgecollapse.h"
+namespace Manta {
+extern "C" {
+void PbRegister_file_18()
+{
+}
+}}
\ No newline at end of file
diff --git a/intern/mantaflow/intern/manta_pp/fastmarch.cpp b/intern/mantaflow/intern/manta_pp/fastmarch.cpp
index a1db230..730a858 100644
--- a/intern/mantaflow/intern/manta_pp/fastmarch.cpp
+++ b/intern/mantaflow/intern/manta_pp/fastmarch.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/blenderIntegration/mantaflowgit/source/fastmarch.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/fastmarch.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
@@ -404,7 +404,7 @@ void extrapolateMACSimple(FlagGrid& flags, MACGrid& vel, int distance = 4, Level
 
 	// copy tangential values into sides
 	knExtrapolateIntoBnd(flags, vel);
-} static PyObject* _W_0 (PyObject* _self, PyObject* _linargs, PyObject* _kwds) { try { PbArgs _args(_linargs, _kwds); FluidSolver *parent = _args.obtainParent(); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); pbPreparePlugin(parent, "extrapolateMACSimple" , !noTiming ); PyObject *_retval = 0; { ArgLocker _lock; FlagGrid& flags = *_args.getPtr<FlagGrid >("flags",0,&_lock); MACGrid& vel = *_args.getPtr<MACGrid >("vel",1,&_lock); int distance = _args.getOpt<int >("distance",2,4,&_lo [...]
+} static PyObject* _W_0 (PyObject* _self, PyObject* _linargs, PyObject* _kwds) { try { PbArgs _args(_linargs, _kwds); FluidSolver *parent = _args.obtainParent(); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); pbPreparePlugin(parent, "extrapolateMACSimple" , !noTiming ); PyObject *_retval = 0; { ArgLocker _lock; FlagGrid& flags = *_args.getPtr<FlagGrid >("flags",0,&_lock); MACGrid& vel = *_args.getPtr<MACGrid >("vel",1,&_lock); int distance = _args.getOpt<int >("distance",2,4,&_lo [...]
 
 
 
@@ -470,7 +470,7 @@ void extrapolateMACFromWeight( MACGrid& vel, Grid<Vec3>& weight, int distance =
 		} // d
 
 	}
-} static PyObject* _W_1 (PyObject* _self, PyObject* _linargs, PyObject* _kwds) { try { PbArgs _args(_linargs, _kwds); FluidSolver *parent = _args.obtainParent(); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); pbPreparePlugin(parent, "extrapolateMACFromWeight" , !noTiming ); PyObject *_retval = 0; { ArgLocker _lock; MACGrid& vel = *_args.getPtr<MACGrid >("vel",0,&_lock); Grid<Vec3>& weight = *_args.getPtr<Grid<Vec3> >("weight",1,&_lock); int distance = _args.getOpt<int >("distance [...]
+} static PyObject* _W_1 (PyObject* _self, PyObject* _linargs, PyObject* _kwds) { try { PbArgs _args(_linargs, _kwds); FluidSolver *parent = _args.obtainParent(); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); pbPreparePlugin(parent, "extrapolateMACFromWeight" , !noTiming ); PyObject *_retval = 0; { ArgLocker _lock; MACGrid& vel = *_args.getPtr<MACGrid >("vel",0,&_lock); Grid<Vec3>& weight = *_args.getPtr<Grid<Vec3> >("weight",1,&_lock); int distance = _args.getOpt<int >("distance [...]
 
 // simple extrapolation functions for levelsets
 
@@ -569,7 +569,7 @@ void extrapolateLsSimple(Grid<Real>& phi, int distance = 4, bool inside=false )
 
 	// set all remaining cells to max
 	knSetRemaining<Real>(phi, tmp, Real(direction * (distance+2)) );
-} static PyObject* _W_2 (PyObject* _self, PyObject* _linargs, PyObject* _kwds) { try { PbArgs _args(_linargs, _kwds)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list