Blender Git Loki

Git Commits -> Revision c08a25d

September 17, 2015, 13:39 (GMT)
updated mantaflow files and some further tweaks to get it working in blender

Commit Details:

Full Hash: c08a25d7e76ea4e042a116829f78f63d1a0c0c79
Parent Commit: 9cbe888
Lines Changed: +6768, -4599

16 Added Paths:

/source/blender/python/manta_full/scenes/simplefire.py (+88, -0) (View)
/source/blender/python/manta_full/tools/tests/test_1040_secOrderBnd.py (+69, -0) (View)
/source/blender/python/manta_pp/gui/moc_customctrl.cpp (+197, -0) (View)
/source/blender/python/manta_pp/gui/moc_customctrl.cpp_parameters (+4, -0) (View)
/source/blender/python/manta_pp/gui/moc_glwidget.cpp (+191, -0) (View)
/source/blender/python/manta_pp/gui/moc_glwidget.cpp_parameters (+4, -0) (View)
/source/blender/python/manta_pp/gui/moc_mainwindow.cpp (+299, -0) (View)
/source/blender/python/manta_pp/gui/moc_mainwindow.cpp_parameters (+4, -0) (View)
/source/blender/python/manta_pp/gui/moc_meshpainter.cpp (+111, -0) (View)
/source/blender/python/manta_pp/gui/moc_meshpainter.cpp_parameters (+4, -0) (View)
/source/blender/python/manta_pp/gui/moc_painter.cpp (+211, -0) (View)
/source/blender/python/manta_pp/gui/moc_painter.cpp_parameters (+4, -0) (View)
/source/blender/python/manta_pp/gui/moc_particlepainter.cpp (+88, -0) (View)
/source/blender/python/manta_pp/gui/moc_particlepainter.cpp_parameters (+4, -0) (View)
/source/blender/python/manta_pp/gui/moc_qtmain.cpp (+230, -0) (View)
/source/blender/python/manta_pp/gui/moc_qtmain.cpp_parameters (+4, -0) (View)

19 Deleted Paths:

/source/blender/python/manta_full/source/flip.cpp (+0, -487)
/source/blender/python/manta_full/source/flip.h (+0, -23)
/source/blender/python/manta_full/source/pwrapper/manta_api.cpp (+0, -27)
/source/blender/python/manta_full/source/pwrapper/manta_api.h (+0, -6)
/source/blender/python/manta_full/source/pwrapper/pymain.h (+0, -8)
/source/blender/python/manta_pp/gui/moc_customctrl.cxx (+0, -165)
/source/blender/python/manta_pp/gui/moc_customctrl.cxx_parameters (+0, -5)
/source/blender/python/manta_pp/gui/moc_glwidget.cxx (+0, -132)
/source/blender/python/manta_pp/gui/moc_glwidget.cxx_parameters (+0, -5)
/source/blender/python/manta_pp/gui/moc_mainwindow.cxx (+0, -175)
/source/blender/python/manta_pp/gui/moc_mainwindow.cxx_parameters (+0, -5)
/source/blender/python/manta_pp/gui/moc_meshpainter.cxx (+0, -93)
/source/blender/python/manta_pp/gui/moc_meshpainter.cxx_parameters (+0, -5)
/source/blender/python/manta_pp/gui/moc_painter.cxx (+0, -170)
/source/blender/python/manta_pp/gui/moc_painter.cxx_parameters (+0, -5)
/source/blender/python/manta_pp/gui/moc_particlepainter.cxx (+0, -80)
/source/blender/python/manta_pp/gui/moc_particlepainter.cxx_parameters (+0, -5)
/source/blender/python/manta_pp/gui/moc_qtmain.cxx (+0, -182)
/source/blender/python/manta_pp/gui/moc_qtmain.cxx_parameters (+0, -5)

170 Modified Paths:

/intern/smoke/CMakeLists.txt (+3, -0) (Diff)
/intern/smoke/intern/MANTA.cpp (+5, -5) (Diff)
/intern/smoke/intern/scenarios/smoke.h (+24, -23) (Diff)
/intern/smoke/intern/smoke_API.cpp (+2, -2) (Diff)
/source/blender/blenkernel/intern/smoke.c (+0, -2) (Diff)
/source/blender/python/manta_full/CMakeLists.txt (+107, -150) (Diff)
/source/blender/python/manta_full/Doxyfile.in (+1, -1) (Diff)
/source/blender/python/manta_full/resources/res.qrc (+3, -1) (Diff)
/source/blender/python/manta_full/scenes/flip02_surface.py (+1, -1) (Diff)
/source/blender/python/manta_full/scenes/flip04_adaptDt.py (+2, -1) (Diff)
/source/blender/python/manta_full/scenes/flip06_secOrderBnd.py (+2, -3) (Diff)
/source/blender/python/manta_full/scenes/karman.py (+3, -4) (Diff)
/source/blender/python/manta_full/scenes/simpleplume.py (+6, -6) (Diff)
/source/blender/python/manta_full/source/commonkernels.h (+1, -1) (Diff)
/source/blender/python/manta_full/source/conjugategrad.cpp (+10, -10) (Diff)
/source/blender/python/manta_full/source/conjugategrad.h (+43, -21) (Diff)
/source/blender/python/manta_full/source/fastmarch.cpp (+133, -15) (Diff)
/source/blender/python/manta_full/source/fastmarch.h (+2, -16) (Diff)
/source/blender/python/manta_full/source/fileio.cpp (+327, -149) (Diff)
/source/blender/python/manta_full/source/fileio.h (+3, -2) (Diff)
/source/blender/python/manta_full/source/fluidsolver.cpp (+51, -64) (Diff)
/source/blender/python/manta_full/source/fluidsolver.h (+28, -27) (Diff)
/source/blender/python/manta_full/source/general.cpp (+31, -12) (Diff)
/source/blender/python/manta_full/source/general.h (+24, -9) (Diff)
/source/blender/python/manta_full/source/grid.cpp (+307, -76) (Diff)
/source/blender/python/manta_full/source/grid.h (+183, -82) (Diff)
/source/blender/python/manta_full/source/gui/customctrl.cpp (+29, -4) (Diff)
/source/blender/python/manta_full/source/gui/customctrl.h (+30, -16) (Diff)
/source/blender/python/manta_full/source/gui/glwidget.cpp (+26, -20) (Diff)
/source/blender/python/manta_full/source/gui/glwidget.h (+14, -11) (Diff)
/source/blender/python/manta_full/source/gui/mainwindow.cpp (+86, -8) (Diff)
/source/blender/python/manta_full/source/gui/mainwindow.h (+30, -5) (Diff)
/source/blender/python/manta_full/source/gui/painter.cpp (+49, -30) (Diff)
/source/blender/python/manta_full/source/gui/painter.h (+8, -5) (Diff)
/source/blender/python/manta_full/source/gui/particlepainter.cpp (+28, -127) (Diff)
/source/blender/python/manta_full/source/gui/qtmain.cpp (+2, -3) (Diff)
/source/blender/python/manta_full/source/kernel.h (+4, -4) (Diff)
/source/blender/python/manta_full/source/levelset.cpp (+46, -71) (Diff)
/source/blender/python/manta_full/source/levelset.h (+8, -7) (Diff)
/source/blender/python/manta_full/source/mesh.cpp (+273, -216) (Diff)
/source/blender/python/manta_full/source/mesh.h (+18, -46) (Diff)
/source/blender/python/manta_full/source/movingobs.h (+5, -5) (Diff)
/source/blender/python/manta_full/source/noisefield.h (+1, -1) (Diff)
/source/blender/python/manta_full/source/particle.cpp (+187, -39) (Diff)
/source/blender/python/manta_full/source/particle.h (+116, -61) (Diff)
/source/blender/python/manta_full/source/plugin/advection.cpp (+220, -155) (Diff)
/source/blender/python/manta_full/source/plugin/extforces.cpp (+225, -40) (Diff)
/source/blender/python/manta_full/source/plugin/fire.cpp (+3, -3) (Diff)
/source/blender/python/manta_full/source/plugin/flip.cpp (+22, -22) (Diff)
/source/blender/python/manta_full/source/plugin/initplugins.cpp (+436, -18) (Diff)
/source/blender/python/manta_full/source/plugin/kepsilon.cpp (+4, -4) (Diff)
/source/blender/python/manta_full/source/plugin/meshplugins.cpp (+3, -3) (Diff)
/source/blender/python/manta_full/source/plugin/pressure.cpp (+292, -310) (Diff)
/source/blender/python/manta_full/source/plugin/vortexplugins.cpp (+10, -10) (Diff)
/source/blender/python/manta_full/source/plugin/waveletturbulence.cpp (+61, -58) (Diff)
/source/blender/python/manta_full/source/plugin/waves.cpp (+4, -4) (Diff)
/source/blender/python/manta_full/source/preprocessor/codegen_kernel.cpp (+1, -1) (Diff)
/source/blender/python/manta_full/source/preprocessor/codegen_python.cpp (+2, -2) (Diff)
/source/blender/python/manta_full/source/preprocessor/tokenize.cpp (+22, -3) (Diff)
/source/blender/python/manta_full/source/pwrapper/manta.h (+6, -9) (Diff)
/source/blender/python/manta_full/source/pwrapper/pclass.cpp (+5, -12) (Diff)
/source/blender/python/manta_full/source/pwrapper/pconvert.cpp (+0, -12) (Diff)
/source/blender/python/manta_full/source/pwrapper/pconvert.h (+5, -1) (Diff)
/source/blender/python/manta_full/source/pwrapper/pymain.cpp (+2, -3) (Diff)
/source/blender/python/manta_full/source/pwrapper/pythonInclude.h (+0, -0) (Diff)
/source/blender/python/manta_full/source/pwrapper/registry.cpp (+13, -34) (Diff)
/source/blender/python/manta_full/source/pwrapper/registry.h (+2, -2) (Diff)
/source/blender/python/manta_full/source/python/defines.py (+1, -0) (Diff)
/source/blender/python/manta_full/source/shapes.cpp (+84, -6) (Diff)
/source/blender/python/manta_full/source/shapes.h (+45, -21) (Diff)
/source/blender/python/manta_full/source/test.cpp (+7, -77) (Diff)
/source/blender/python/manta_full/source/timing.h (+4, -4) (Diff)
/source/blender/python/manta_full/source/turbulencepart.h (+6, -6) (Diff)
/source/blender/python/manta_full/source/util/interpol.h (+15, -15) (Diff)
/source/blender/python/manta_full/source/util/interpolHigh.h (+158, -29) (Diff)
/source/blender/python/manta_full/source/util/vectorbase.cpp (+7, -5) (Diff)
/source/blender/python/manta_full/source/util/vectorbase.h (+12, -8) (Diff)
/source/blender/python/manta_full/source/vortexpart.h (+4, -4) (Diff)
/source/blender/python/manta_full/source/vortexsheet.h (+5, -5) (Diff)
/source/blender/python/manta_pp/commonkernels.h (+1, -0) (Diff)
/source/blender/python/manta_pp/conjugategrad.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/conjugategrad.h (+1, -0) (Diff)
/source/blender/python/manta_pp/edgecollapse.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/edgecollapse.h (+1, -0) (Diff)
/source/blender/python/manta_pp/fastmarch.cpp (+16, -14) (Diff)
/source/blender/python/manta_pp/fastmarch.h (+2, -3) (Diff)
/source/blender/python/manta_pp/fileio.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/fileio.h (+1, -0) (Diff)
/source/blender/python/manta_pp/fluidsolver.cpp (+2, -9) (Diff)
/source/blender/python/manta_pp/fluidsolver.h (+1, -0) (Diff)
/source/blender/python/manta_pp/general.cpp (+22, -2) (Diff)
/source/blender/python/manta_pp/general.h (+24, -8) (Diff)
/source/blender/python/manta_pp/grid.cpp (+178, -113) (Diff)
/source/blender/python/manta_pp/grid.h (+41, -30) (Diff)
/source/blender/python/manta_pp/grid.h.reg (+8, -12) (Diff)
/source/blender/python/manta_pp/grid.h.reg.cpp (+83, -93) (Diff)
/source/blender/python/manta_pp/gui/customctrl.cpp (+15, -2) (Diff)
/source/blender/python/manta_pp/gui/customctrl.h (+6, -1) (Diff)
/source/blender/python/manta_pp/gui/customctrl.h.reg (+4, -0) (Diff)
/source/blender/python/manta_pp/gui/customctrl.h.reg.cpp (+4, -0) (Diff)
/source/blender/python/manta_pp/gui/glwidget.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/gui/glwidget.h (+14, -12) (Diff)
/source/blender/python/manta_pp/gui/mainwindow.cpp (+23, -6) (Diff)
/source/blender/python/manta_pp/gui/mainwindow.h (+7, -1) (Diff)
/source/blender/python/manta_pp/gui/meshpainter.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/gui/meshpainter.h (+1, -0) (Diff)
/source/blender/python/manta_pp/gui/painter.cpp (+36, -19) (Diff)
/source/blender/python/manta_pp/gui/painter.h (+2, -1) (Diff)
/source/blender/python/manta_pp/gui/particlepainter.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/gui/particlepainter.h (+1, -0) (Diff)
/source/blender/python/manta_pp/gui/qtmain.cpp (+3, -3) (Diff)
/source/blender/python/manta_pp/gui/qtmain.h (+1, -0) (Diff)
/source/blender/python/manta_pp/hginfo.h (+1, -1) (Diff)
/source/blender/python/manta_pp/kernel.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/kernel.h (+3, -4) (Diff)
/source/blender/python/manta_pp/levelset.cpp (+11, -29) (Diff)
/source/blender/python/manta_pp/levelset.h (+4, -2) (Diff)
/source/blender/python/manta_pp/levelset.h.reg (+2, -1) (Diff)
/source/blender/python/manta_pp/levelset.h.reg.cpp (+2, -1) (Diff)
/source/blender/python/manta_pp/mesh.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/mesh.h (+1, -0) (Diff)
/source/blender/python/manta_pp/movingobs.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/movingobs.h (+1, -0) (Diff)
/source/blender/python/manta_pp/noisefield.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/noisefield.h (+1, -0) (Diff)
/source/blender/python/manta_pp/particle.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/particle.h (+24, -19) (Diff)
/source/blender/python/manta_pp/plugin/advection.cpp (+89, -24) (Diff)
/source/blender/python/manta_pp/plugin/extforces.cpp (+220, -122) (Diff)
/source/blender/python/manta_pp/plugin/fire.cpp (+2, -1) (Diff)
/source/blender/python/manta_pp/plugin/flip.cpp (+74, -24) (Diff)
/source/blender/python/manta_pp/plugin/initplugins.cpp (+161, -17) (Diff)
/source/blender/python/manta_pp/plugin/kepsilon.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/plugin/meshplugins.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/plugin/pressure.cpp (+46, -138) (Diff)
/source/blender/python/manta_pp/plugin/vortexplugins.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/plugin/waveletturbulence.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/plugin/waves.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/pwrapper/manta.h (+6, -9) (Diff)
/source/blender/python/manta_pp/pwrapper/pclass.cpp (+1, -7) (Diff)
/source/blender/python/manta_pp/pwrapper/pconvert.h (+5, -1) (Diff)
/source/blender/python/manta_pp/pwrapper/pythonInclude.h (+0, -0) (Diff)
/source/blender/python/manta_pp/pwrapper/registry.cpp (+10, -30) (Diff)
/source/blender/python/manta_pp/pwrapper/registry.h (+1, -1) (Diff)
/source/blender/python/manta_pp/python/defines.py.reg (+1, -1) (Diff)
/source/blender/python/manta_pp/python/defines.py.reg.cpp (+1, -1) (Diff)
/source/blender/python/manta_pp/shapes.cpp (+79, -0) (Diff)
/source/blender/python/manta_pp/shapes.h (+26, -2) (Diff)
/source/blender/python/manta_pp/shapes.h.reg (+3, -0) (Diff)
/source/blender/python/manta_pp/shapes.h.reg.cpp (+6, -2) (Diff)
/source/blender/python/manta_pp/test.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/timing.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/timing.h (+1, -0) (Diff)
/source/blender/python/manta_pp/turbulencepart.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/turbulencepart.h (+1, -0) (Diff)
/source/blender/python/manta_pp/util/integrator.h (+0, -0) (Diff)
/source/blender/python/manta_pp/util/interpol.h (+0, -0) (Diff)
/source/blender/python/manta_pp/util/interpolHigh.h (+0, -0) (Diff)
/source/blender/python/manta_pp/util/mcubes.h (+0, -0) (Diff)
/source/blender/python/manta_pp/util/quaternion.h (+0, -0) (Diff)
/source/blender/python/manta_pp/util/randomstream.h (+0, -0) (Diff)
/source/blender/python/manta_pp/util/simpleimage.cpp (+0, -0) (Diff)
/source/blender/python/manta_pp/util/simpleimage.h (+0, -0) (Diff)
/source/blender/python/manta_pp/util/solvana.h (+0, -0) (Diff)
/source/blender/python/manta_pp/util/vectorbase.cpp (+0, -0) (Diff)
/source/blender/python/manta_pp/util/vectorbase.h (+4, -2) (Diff)
/source/blender/python/manta_pp/vortexpart.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/vortexpart.h (+1, -0) (Diff)
/source/blender/python/manta_pp/vortexsheet.cpp (+1, -0) (Diff)
/source/blender/python/manta_pp/vortexsheet.h (+1, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021