[Bf-blender-cvs] [c08a25d] fluid-mantaflow: updated mantaflow files and some further tweaks to get it working in blender
Sebastián Barschkis
noreply at git.blender.org
Thu Jan 28 12:36:42 CET 2016
Commit: c08a25d7e76ea4e042a116829f78f63d1a0c0c79
Author: Sebastián Barschkis
Date: Thu Sep 17 15:39:39 2015 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBc08a25d7e76ea4e042a116829f78f63d1a0c0c79
updated mantaflow files and some further tweaks to get it working in blender
===================================================================
M intern/smoke/CMakeLists.txt
M intern/smoke/intern/MANTA.cpp
M intern/smoke/intern/scenarios/smoke.h
M intern/smoke/intern/smoke_API.cpp
M source/blender/blenkernel/intern/smoke.c
M source/blender/python/manta_full/CMakeLists.txt
M source/blender/python/manta_full/Doxyfile.in
M source/blender/python/manta_full/resources/res.qrc
M source/blender/python/manta_full/scenes/flip02_surface.py
M source/blender/python/manta_full/scenes/flip04_adaptDt.py
M source/blender/python/manta_full/scenes/flip06_secOrderBnd.py
M source/blender/python/manta_full/scenes/karman.py
A source/blender/python/manta_full/scenes/simplefire.py
M source/blender/python/manta_full/scenes/simpleplume.py
M source/blender/python/manta_full/source/commonkernels.h
M source/blender/python/manta_full/source/conjugategrad.cpp
M source/blender/python/manta_full/source/conjugategrad.h
M source/blender/python/manta_full/source/fastmarch.cpp
M source/blender/python/manta_full/source/fastmarch.h
M source/blender/python/manta_full/source/fileio.cpp
M source/blender/python/manta_full/source/fileio.h
D source/blender/python/manta_full/source/flip.cpp
D source/blender/python/manta_full/source/flip.h
M source/blender/python/manta_full/source/fluidsolver.cpp
M source/blender/python/manta_full/source/fluidsolver.h
M source/blender/python/manta_full/source/general.cpp
M source/blender/python/manta_full/source/general.h
M source/blender/python/manta_full/source/grid.cpp
M source/blender/python/manta_full/source/grid.h
M source/blender/python/manta_full/source/gui/customctrl.cpp
M source/blender/python/manta_full/source/gui/customctrl.h
M source/blender/python/manta_full/source/gui/glwidget.cpp
M source/blender/python/manta_full/source/gui/glwidget.h
M source/blender/python/manta_full/source/gui/mainwindow.cpp
M source/blender/python/manta_full/source/gui/mainwindow.h
M source/blender/python/manta_full/source/gui/painter.cpp
M source/blender/python/manta_full/source/gui/painter.h
M source/blender/python/manta_full/source/gui/particlepainter.cpp
M source/blender/python/manta_full/source/gui/qtmain.cpp
M source/blender/python/manta_full/source/kernel.h
M source/blender/python/manta_full/source/levelset.cpp
M source/blender/python/manta_full/source/levelset.h
M source/blender/python/manta_full/source/mesh.cpp
M source/blender/python/manta_full/source/mesh.h
M source/blender/python/manta_full/source/movingobs.h
M source/blender/python/manta_full/source/noisefield.h
M source/blender/python/manta_full/source/particle.cpp
M source/blender/python/manta_full/source/particle.h
M source/blender/python/manta_full/source/plugin/advection.cpp
M source/blender/python/manta_full/source/plugin/extforces.cpp
M source/blender/python/manta_full/source/plugin/fire.cpp
M source/blender/python/manta_full/source/plugin/flip.cpp
M source/blender/python/manta_full/source/plugin/initplugins.cpp
M source/blender/python/manta_full/source/plugin/kepsilon.cpp
M source/blender/python/manta_full/source/plugin/meshplugins.cpp
M source/blender/python/manta_full/source/plugin/pressure.cpp
M source/blender/python/manta_full/source/plugin/vortexplugins.cpp
M source/blender/python/manta_full/source/plugin/waveletturbulence.cpp
M source/blender/python/manta_full/source/plugin/waves.cpp
M source/blender/python/manta_full/source/preprocessor/codegen_kernel.cpp
M source/blender/python/manta_full/source/preprocessor/codegen_python.cpp
M source/blender/python/manta_full/source/preprocessor/tokenize.cpp
M source/blender/python/manta_full/source/pwrapper/manta.h
D source/blender/python/manta_full/source/pwrapper/manta_api.cpp
D source/blender/python/manta_full/source/pwrapper/manta_api.h
M source/blender/python/manta_full/source/pwrapper/pclass.cpp
M source/blender/python/manta_full/source/pwrapper/pconvert.cpp
M source/blender/python/manta_full/source/pwrapper/pconvert.h
M source/blender/python/manta_full/source/pwrapper/pymain.cpp
D source/blender/python/manta_full/source/pwrapper/pymain.h
M source/blender/python/manta_full/source/pwrapper/pythonInclude.h
M source/blender/python/manta_full/source/pwrapper/registry.cpp
M source/blender/python/manta_full/source/pwrapper/registry.h
M source/blender/python/manta_full/source/python/defines.py
M source/blender/python/manta_full/source/shapes.cpp
M source/blender/python/manta_full/source/shapes.h
M source/blender/python/manta_full/source/test.cpp
M source/blender/python/manta_full/source/timing.h
M source/blender/python/manta_full/source/turbulencepart.h
M source/blender/python/manta_full/source/util/interpol.h
M source/blender/python/manta_full/source/util/interpolHigh.h
M source/blender/python/manta_full/source/util/vectorbase.cpp
M source/blender/python/manta_full/source/util/vectorbase.h
M source/blender/python/manta_full/source/vortexpart.h
M source/blender/python/manta_full/source/vortexsheet.h
A source/blender/python/manta_full/tools/tests/test_1040_secOrderBnd.py
M source/blender/python/manta_pp/commonkernels.h
M source/blender/python/manta_pp/conjugategrad.cpp
M source/blender/python/manta_pp/conjugategrad.h
M source/blender/python/manta_pp/edgecollapse.cpp
M source/blender/python/manta_pp/edgecollapse.h
M source/blender/python/manta_pp/fastmarch.cpp
M source/blender/python/manta_pp/fastmarch.h
M source/blender/python/manta_pp/fileio.cpp
M source/blender/python/manta_pp/fileio.h
M source/blender/python/manta_pp/fluidsolver.cpp
M source/blender/python/manta_pp/fluidsolver.h
M source/blender/python/manta_pp/general.cpp
M source/blender/python/manta_pp/general.h
M source/blender/python/manta_pp/grid.cpp
M source/blender/python/manta_pp/grid.h
M source/blender/python/manta_pp/grid.h.reg
M source/blender/python/manta_pp/grid.h.reg.cpp
M source/blender/python/manta_pp/gui/customctrl.cpp
M source/blender/python/manta_pp/gui/customctrl.h
M source/blender/python/manta_pp/gui/customctrl.h.reg
M source/blender/python/manta_pp/gui/customctrl.h.reg.cpp
M source/blender/python/manta_pp/gui/glwidget.cpp
M source/blender/python/manta_pp/gui/glwidget.h
M source/blender/python/manta_pp/gui/mainwindow.cpp
M source/blender/python/manta_pp/gui/mainwindow.h
M source/blender/python/manta_pp/gui/meshpainter.cpp
M source/blender/python/manta_pp/gui/meshpainter.h
A source/blender/python/manta_pp/gui/moc_customctrl.cpp
A source/blender/python/manta_pp/gui/moc_customctrl.cpp_parameters
D source/blender/python/manta_pp/gui/moc_customctrl.cxx
D source/blender/python/manta_pp/gui/moc_customctrl.cxx_parameters
A source/blender/python/manta_pp/gui/moc_glwidget.cpp
A source/blender/python/manta_pp/gui/moc_glwidget.cpp_parameters
D source/blender/python/manta_pp/gui/moc_glwidget.cxx
D source/blender/python/manta_pp/gui/moc_glwidget.cxx_parameters
A source/blender/python/manta_pp/gui/moc_mainwindow.cpp
A source/blender/python/manta_pp/gui/moc_mainwindow.cpp_parameters
D source/blender/python/manta_pp/gui/moc_mainwindow.cxx
D source/blender/python/manta_pp/gui/moc_mainwindow.cxx_parameters
A source/blender/python/manta_pp/gui/moc_meshpainter.cpp
A source/blender/python/manta_pp/gui/moc_meshpainter.cpp_parameters
D source/blender/python/manta_pp/gui/moc_meshpainter.cxx
D source/blender/python/manta_pp/gui/moc_meshpainter.cxx_parameters
A source/blender/python/manta_pp/gui/moc_painter.cpp
A source/blender/python/manta_pp/gui/moc_painter.cpp_parameters
D source/blender/python/manta_pp/gui/moc_painter.cxx
D source/blender/python/manta_pp/gui/moc_painter.cxx_parameters
A source/blender/python/manta_pp/gui/moc_particlepainter.cpp
A source/blender/python/manta_pp/gui/moc_particlepainter.cpp_parameters
D source/blender/python/manta_pp/gui/moc_particlepainter.cxx
D source/blender/python/manta_pp/gui/moc_particlepainter.cxx_parameters
A source/blender/python/manta_pp/gui/moc_qtmain.cpp
A source/blender/python/manta_pp/gui/moc_qtmain.cpp_parameters
D source/blender/python/manta_pp/gui/moc_qtmain.cxx
D source/blender/python/manta_pp/gui/moc_qtmain.cxx_parameters
M source/blender/python/manta_pp/gui/painter.cpp
M source/blender/python/manta_pp/gui/painter.h
M source/blender/python/manta_pp/gui/particlepainter.cpp
M source/blender/python/manta_pp/gui/particlepainter.h
M source/blender/python/manta_pp/gui/qtmain.cpp
M source/blender/python/manta_pp/gui/qtmain.h
M source/blender/python/manta_pp/hginfo.h
M source/blender/python/manta_pp/kernel.cpp
M source/blender/python/manta_pp/kernel.h
M source/blender/python/manta_pp/levelset.cpp
M source/blender/python/manta_pp/levelset.h
M source/blender/python/manta_pp/levelset.h.reg
M source/blender/python/manta_pp/levelset.h.reg.cpp
M source/blender/python/manta_pp/mesh.cpp
M source/blender/python/manta_pp/mesh.h
M source/blender/python/manta_pp/movingobs.cpp
M source/blender/python/manta_pp/movingobs.h
M source/blender/python/manta_pp/noisefield.cpp
M source/blender/python/manta_pp/noisefield.h
M source/blender/python/manta_pp/particle.cpp
M source/blender/python/manta_pp/particle.h
M source/blender/python/manta_pp/plugin/advection.cpp
M source/blender/python/manta_pp/plugin/extforces.cpp
M source/blender/python/manta_pp/plugin/fire.cpp
M source/blender/python/manta_pp/plugin/flip.cpp
M source/blender/python/manta_pp/plugin/initplugins.cpp
M source/blender/python/manta_pp/plugin/kepsilon.cpp
M source/blender/python/manta_pp/plugin/meshplugins.cpp
M source/blender/python/manta_pp/plugin/pressure.cpp
M source/blender/python/manta_pp/plugin/vortexplugins.cpp
M source/blender/python/manta_pp/plugin/waveletturbulence.cpp
M source/blender/python/manta_pp/plugin/waves.cpp
M source/blender/python/manta_pp/pwrapper/manta.h
M source/blender/python/manta_pp/pwrapper/pclass.cpp
M source/blender/python/manta_pp/pwrapper/pconvert.h
M source/blender/python/manta_pp/pwrapper/pythonInclude.h
M source/blender/python/manta_pp/pwrapper/registry.cpp
M source/blender/python/manta_pp/pwrapper/registry.h
M source/blender/python/manta_pp/python/defines.py.reg
M source/blender/python/manta_pp/python/defines.py.reg.cpp
M source/blender/python/manta_pp/shapes.cpp
M source/blender/python/manta_pp/shapes.h
M source/blender/python/manta_pp/shapes.h.reg
M source/blender/python/manta_pp/shapes.h.reg.cpp
M source/blender/python/manta_pp/test.cpp
M source/blender/python/manta_pp/timing.cpp
M source/blender/python/manta_pp/timing.h
M source/blender/python/manta_pp/turbulencepart.cpp
M source/blender/python/manta_pp/turbulencepart.h
M source/blender/python/manta_pp/util/integrator.h
M source/blender/python/manta_pp/util/interpol.h
M source/blender/python/manta_pp/util/interpolHigh.h
M source/blender/python/manta_pp/util/mcubes.h
M source/blender/python/manta_pp/util/quaternion.h
M source/blender/python/manta_pp/util/randomstream.h
M source/blender/python/manta_pp/util/simpleimage.cpp
M source/blender/python/manta_pp/util/simpleimage.h
M source/blender/python/manta_pp/util/solvana.h
M source/blender/python/manta_pp/util/vectorbase.cpp
M source/blender/python/manta_pp/util/vectorbase.h
M source/blender/python/manta_pp/vortexpart.cpp
M source/blender/python/manta_pp/vortexpart.h
M source/blender/python/manta_pp/vortexsheet.cpp
M source/blender/python/manta_pp/vortexsheet.h
===================================================================
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 54b4da4..662b47d 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -27,6 +27,9 @@ set(INC
intern
../memutil
../../source/blender/blenlib
+ ../../source/blender/python/manta_pp
+ ../../source/blender/python/manta_pp/util/
+ extern
)
set(INC_SYS
diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index 813c3b5..84a421e 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -573,7 +573,7 @@ string Manta_API::getGridPointer(std::string gridName, std::string solverName)
if ((gridName == "") && (solverName == "")){
return "";
}
- //cout << "getting grid pointer " << gridName<< " , " << solverName <<endl;
+ cout << "getting grid pointer " << gridName<< " , " << solverName <<endl;
PyGILState_STATE gilstate = PyGILState_Ensure();
PyObject *main = PyImport_AddModule("__main__");
if (main == NULL){cout << "null" << 1 << endl;return "";}
@@ -587,7 +587,7 @@ string Manta_API::getGridPointer(std::string gridName, std::string solverName)
PyObject* encoded = PyUnicode_AsUTF8String(retured_value);
if (retured_value == NULL){cout << "null" << 15 << endl;return "";}
std::string res = strdup(PyBytes_AsString(encoded));
- //cout << "Pointer on "<< gridName << " " << res << endl;
+ cout << "Pointer on "<< gridName << " " << res << endl;
PyGILState_Release(gilstate);
return res;
}
@@ -624,10 +624,10 @@ void Manta_API::updatePointers(FLUID_3D *fluid)
//x + y * max_x + z * max_x*max_y
// int position_to_copy_from(0 + (fluid->xRes()/2) * fluid->xRes() + (fluid->zRes()/2) * fluid->xRes()*fluid->yRes());
// float *whereToCopy = &fluid->_density[position_to_copy_from];
- //cout << 'Updating pointers' << endl;
+ cout << "Updating pointers" << endl;
if (fluid->manta_resoution == 2)
{
- //cout << '2D' << endl;
+ cout << "2D" << endl;
float* manta_fluid_density = (float* )pointerFromString(getGridPointer("density", "s"));
int* manta_fluid_flags = (int* )pointerFromString(getGridPointer("flags", "s"));
if (fluid->_density != NULL){
@@ -649,7 +649,7 @@ void Manta_API::updatePointers(FLUID_3D *fluid)
}
}
else {
- //cout << '3D' << endl;
+ cout << "3D" << endl;
fluid->_density = (float* )pointerFromString(getGridPointer("density", "s"));
fluid->_manta_flags = (int* )pointerFromString(getGridPointer("flags", "s"));
}
diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h
index 89912c2..eb78fc0 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -11,7 +11,7 @@ def transform_back(obj, gs):\n\
\n\
def load_once(grid, file, dict):\n\
if grid not in dict:\n\
- #print('Loading file' + file + 'in grid')\n\
+ print('Loading file' + file + 'in grid')\n\
grid.load(file)\n\
dict[grid] = 1\n\
\n\
@@ -86,7 +86,7 @@ if $USE_WAVELETS$ and $UPRES$ > 0:\n\
xl_wltnoise.timeAnim = 0.1 \n\
";
-const string smoke_init_colors_low = "#print(\"Initializing colors\")\n\
+const string smoke_init_colors_low = "print(\"Initializing colors\")\n\
color_r_low = s.create(RealGrid)\n\
color_g_low = s.create(RealGrid)\n\
color_b_low = s.create(RealGrid)\n\
@@ -106,7 +106,7 @@ del color_g_low \n\
del color_b_low \n\
manta_using_colors = False";
-const string smoke_init_colors_high = "#print(\"Initializing colors highres\")\n\
+const string smoke_init_colors_high = "print(\"Initializing colors highres\")\n\
color_r_high = xl.create(RealGrid)\n\
color_g_high = xl.create(RealGrid)\n\
color_b_high = xl.create(RealGrid)\n\
@@ -120,17 +120,17 @@ color_b_high.add(xl_density) \n\
color_b_high.multConst(manta_color_b) \n\
manta_using_colors = True\n";
-const string smoke_init_heat_low = "#print(\"Initializing heat lowres\")\n\
+const string smoke_init_heat_low = "print(\"Initializing heat lowres\")\n\
heat_low = s.create(RealGrid)\n\
manta_using_heat = True\n";
-const string smoke_init_fire_low = "#print(\"Initializing fire lowres\")\n\
+const string smoke_init_fire_low = "print(\"Initializing fire lowres\")\n\
flame_low = s.create(RealGrid)\n\
fuel_low = s.create(RealGrid)\n\
react_low = s.create(RealGrid)\n\
manta_using_fire = True\n";
-const string smoke_init_fire_high = "#print(\"Initializing fire highres\")\n\
+const string smoke_init_fire_high = "print(\"Initializing fire highres\")\n\
flame_high = xl.create(RealGrid)\n\
fuel_high = xl.create(RealGrid)\n\
react_high = xl.create(RealGrid)\n\
@@ -156,7 +156,7 @@ density.save(os.path.join('$MANTA_EXPORT_PATH$','density.uni'))\n\
flags.save(os.path.join('$MANTA_EXPORT_PATH$','flags.uni'))\n\
inflow_grid.save(os.path.join('$MANTA_EXPORT_PATH$','inflow.uni'))\n\
forces.save(os.path.join('$MANTA_EXPORT_PATH$','forces.uni'))\n\
-#print('Grids exported')";
+print('Grids exported')";
const string fire_process_burn_low = "\n\
processBurn(fuel=fuel_low, density=density, react=react_low, red=color_r_low, green=color_g_low, blue=color_b_low, heat=heat_low, burningRate=burning_rate, flameSmoke=flame_smoke, ignitionTemp=ignition_temp, maxTemp=max_temp, dt=dt, flameSmokeColor=flame_smoke_color)";
@@ -192,7 +192,7 @@ const string smoke_step_low = "def sim_step_low(t, standalone = False):\n\
density.add(inflow_grid)\n\
elif solver_dim == 2:\n\
density.add(inflow_grid)\n\
- #print ('Simulating frame ' + str(t))\n\
+ print ('Simulating frame ' + str(t))\n\
if not standalone and t == 1 and solver_dim == 2:\n\
density.add(inflow_grid)\n\
if manta_using_heat:\n\
@@ -202,31 +202,32 @@ const string smoke_step_low = "def sim_step_low(t, standalone = False):\n\
gravity=vec3(0,0,-0.01 * $ALPHA$) if solver_dim==3 else vec3(0,-0.01* $ALPHA$,0)\n\
addBuoyancy(density=density, vel=vel, gravity=gravity, flags=flags)\n\
if manta_using_colors:\n\
- #print ('Advecting colors')\n\
+ print ('Advecting colors')\n\
advectSemiLagrange(flags=flags, vel=vel, grid=color_r_low, order=$ADVECT_ORDER$)\n\
advectSemiLagrange(flags=flags, vel=vel, grid=color_g_low, order=$ADVECT_ORDER$)\n\
advectSemiLagrange(flags=flags, vel=vel, grid=color_b_low, order=$ADVECT_ORDER$)\n\
if manta_using_fire:\n\
- #print ('Advecting fire')\n\
+ print ('Advecting fire')\n\
advectSemiLagrange(flags=flags, vel=vel, grid=fuel_low, order=$ADVECT_ORDER$)\n\
advectSemiLagrange(flags=flags, vel=vel, grid=react_low, order=$ADVECT_ORDER$)\n\
- #print ('Advecting density')\n\
+ print ('Advecting density')\n\
advectSemiLagrange(flags=flags, vel=vel, grid=density, order=$ADVECT_ORDER$)\n\
- #print ('Advecting velocity')\n\
+ print ('Advecting velocity')\n\
advectSemiLagrange(flags=flags, vel=vel, grid=vel , order=$ADVECT_ORDER$, strength=1.0)\n\
\n\
- #print ('Walls')\n\
+ print ('Walls')\n\
setWallBcs(flags=flags, vel=vel)\n\
- #print ('Vorticity')\n\
+ print ('Vorticity')\n\
if $VORTICITY$ > 0.01:\n\
vorticityConfinement( vel=vel, flags=flags, strength=$VORTICITY$ ) \n\
- #print ('Forcefield')\n\
- addForceField(flags=flags, vel=vel, force=forces)\n\
+ print ('Forcefield')\n\
+ #addForceField(flags=flags, vel=vel, force=forces)\n\
forces.clear()\n\
\n\
- #print ('Pressure')\n\
- solvePressure(flags=flags, vel=vel, pressure=pressure, openBound=boundConditions)\n\
- #print ('Walls')\n\
+ print ('Pressure')\n\
+ # TODO: where to put openBound? solvePressure(flags=flags, vel=vel, pressure=pressure, openBound=boundConditions)\n\
+ solvePressure(flags=flags, vel=vel, pressure=pressure)\n\
+ print ('Walls')\n\
setWallBcs(flags=flags, vel=vel)\n\
\n\
s.step()\n\
@@ -236,10 +237,10 @@ const string liquid_step_low = "def sim_step_low(t):\n\
#update flags from density on first step\n\
setWallBcs(flags=flags, vel=vel)\n\
density.multConst(-1.)\n\
- #print (manta_using_colors)\n\
+ print (manta_using_colors)\n\
global low_flags_updated\n\
if not low_flags_updated:\n\
- #print ('Updating Flags from Levelset on startup!')\n\
+ print ('Updating Flags from Levelset on startup!')\n\
flags.updateFromLevelset(density)\n\
low_flags_updated = True \n\
setWallBcs(flags=flags, vel=vel)\n\
@@ -252,7 +253,7 @@ const string liquid_step_low = "def sim_step_low(t):\n\
\n\
# print current maximal velocity\n\
maxvel = vel.getMaxValue()\n\
- #print ('Current max velocity %f ' % maxvel)\n\
+ print ('Current max velocity %f ' % maxvel)\n\
\n\
# pressure solve\n\
setWallBcs(flags=flags, vel=vel)\n\
@@ -383,7 +384,7 @@ def sim_step(t):\n\
extrapolateSimpleFlags( flags=flags, val=tempFlag, distance=2, flagFrom=FlagObstacle, flagTo=FlagFluid )\n\
extrapolateSimpleFlags( flags=tempFlag, val=energy, distance=6, flagFrom=FlagFluid, flagTo=FlagObstacle )\n\
computeWaveletCoeffs(energy)\n\
- #print(\"Writing Grid to \" + $DENSITY_MEM$ + \"with size\" + $DENSITY_SIZE$)\n\
+ print(\"Writing Grid to \" + $DENSITY_MEM$ + \"with size\" + $DENSITY_SIZE$)\n\
density.writeGridToMemory(memLoc = $DENSITY_MEM$,sizeAllowed = $DENSITY_SIZE$)\n\
density.save('den%04d_temp.uni' % t) \n\
os.rename('den%04d_temp.uni' % t, 'den%04d.uni' % t) \n\
diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index 3636788..8ecc06d 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -36,8 +36,8 @@
#include <stdlib.h>
#include <math.h>
#include "MANTA.h"
-#include "../../../source/blender/python/manta_pp/util/vectorbase.h"
-#include "../extern/smoke_API.h" /* to ensure valid prototypes */
+#include "vectorbase.h" /* mantaflow */
+#include "smoke_API.h" /* to ensure valid prototypes */
extern "C" int *smoke_get_manta_flags(struct FLUID_3D *fluid){
return fluid->_manta_flags;
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 51e5277..012f825 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1747,11 +1747,9 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo
dm->release(dm);
}
- #if 0
clock_t end = clock();
float seconds =
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list