[Bf-blender-cvs] [5bd23ad] soc-2014-fluid: division on manta_pp and manta_full to switch between full module and pp files

Roman Pogribnyi noreply at git.blender.org
Tue Jul 22 15:20:44 CEST 2014


Commit: 5bd23adb6264e16f1f9c789cf1501c49469a6a9a
Author: Roman Pogribnyi
Date:   Tue Jul 22 15:18:47 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB5bd23adb6264e16f1f9c789cf1501c49469a6a9a

division on manta_pp and manta_full to switch between full module and pp files

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

M	source/blender/python/CMakeLists.txt
M	source/blender/python/intern/bpy_interface.c
A	source/blender/python/manta_full/CMakeLists.txt
A	source/blender/python/manta_full/COPYING
A	source/blender/python/manta_full/Doxyfile.in
A	source/blender/python/manta_full/INSTALLING
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/adler32.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/compress.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/crc32.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/crc32.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/deflate.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/deflate.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzclose.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzguts.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzlib.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzread.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzwrite.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/infback.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/inffast.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/inffast.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/inffixed.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/inflate.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/inflate.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/inftrees.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/inftrees.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/trees.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/trees.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/uncompr.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/zconf.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/zlib.h
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/zutil.c
A	source/blender/python/manta_full/dependencies/zlib-1.2.8/zutil.h
A	source/blender/python/manta_full/fluidsolver.h.reg.cpp
A	source/blender/python/manta_full/general.h
A	source/blender/python/manta_full/resources/pause.png
A	source/blender/python/manta_full/resources/play.png
A	source/blender/python/manta_full/resources/res.qrc
A	source/blender/python/manta_full/resources/stop.png
A	source/blender/python/manta_full/scenes/simpleplume.py
A	source/blender/python/manta_full/source/cmake/FindTBB.cmake
A	source/blender/python/manta_full/source/commonkernels.h
A	source/blender/python/manta_full/source/conjugategrad.cpp
A	source/blender/python/manta_full/source/conjugategrad.h
A	source/blender/python/manta_full/source/cuda/buoyancy.cu
A	source/blender/python/manta_full/source/cuda/cudatools.h
A	source/blender/python/manta_full/source/cuda/curlnoise.cu
A	source/blender/python/manta_full/source/cuda/curlnoise.h
A	source/blender/python/manta_full/source/cuda/meshtools.cu
A	source/blender/python/manta_full/source/cuda/particle.cu
A	source/blender/python/manta_full/source/cuda/turbulence.cu
A	source/blender/python/manta_full/source/edgecollapse.cpp
A	source/blender/python/manta_full/source/edgecollapse.h
A	source/blender/python/manta_full/source/fastmarch.cpp
A	source/blender/python/manta_full/source/fastmarch.h
A	source/blender/python/manta_full/source/fileio.cpp
A	source/blender/python/manta_full/source/fileio.h
A	source/blender/python/manta_full/source/flip.cpp
A	source/blender/python/manta_full/source/flip.h
A	source/blender/python/manta_full/source/fluidsolver.cpp
A	source/blender/python/manta_full/source/fluidsolver.h
A	source/blender/python/manta_full/source/general.cpp
A	source/blender/python/manta_full/source/general.h
A	source/blender/python/manta_full/source/grid.cpp
A	source/blender/python/manta_full/source/grid.h
A	source/blender/python/manta_full/source/gui/customctrl.cpp
A	source/blender/python/manta_full/source/gui/customctrl.h
A	source/blender/python/manta_full/source/gui/glwidget.cpp
A	source/blender/python/manta_full/source/gui/glwidget.h
A	source/blender/python/manta_full/source/gui/mainwindow.cpp
A	source/blender/python/manta_full/source/gui/mainwindow.h
A	source/blender/python/manta_full/source/gui/meshpainter.cpp
A	source/blender/python/manta_full/source/gui/meshpainter.h
A	source/blender/python/manta_full/source/gui/painter.cpp
A	source/blender/python/manta_full/source/gui/painter.h
A	source/blender/python/manta_full/source/gui/particlepainter.cpp
A	source/blender/python/manta_full/source/gui/particlepainter.h
A	source/blender/python/manta_full/source/gui/qtmain.cpp
A	source/blender/python/manta_full/source/gui/qtmain.h
A	source/blender/python/manta_full/source/kernel.cpp
A	source/blender/python/manta_full/source/kernel.h
A	source/blender/python/manta_full/source/levelset.cpp
A	source/blender/python/manta_full/source/levelset.h
A	source/blender/python/manta_full/source/mesh.cpp
A	source/blender/python/manta_full/source/mesh.h
A	source/blender/python/manta_full/source/movingobs.cpp
A	source/blender/python/manta_full/source/movingobs.h
A	source/blender/python/manta_full/source/noisefield.cpp
A	source/blender/python/manta_full/source/noisefield.h
A	source/blender/python/manta_full/source/particle.cpp
A	source/blender/python/manta_full/source/particle.h
A	source/blender/python/manta_full/source/plugin/advection.cpp
A	source/blender/python/manta_full/source/plugin/extforces.cpp
A	source/blender/python/manta_full/source/plugin/initplugins.cpp
A	source/blender/python/manta_full/source/plugin/kepsilon.cpp
A	source/blender/python/manta_full/source/plugin/meshplugins.cpp
A	source/blender/python/manta_full/source/plugin/pressure.cpp
A	source/blender/python/manta_full/source/plugin/vortexplugins.cpp
A	source/blender/python/manta_full/source/plugin/waveletturbulence.cpp
A	source/blender/python/manta_full/source/preprocessor/code.cpp
A	source/blender/python/manta_full/source/preprocessor/code.h
A	source/blender/python/manta_full/source/preprocessor/codegen_kernel.cpp
A	source/blender/python/manta_full/source/preprocessor/codegen_python.cpp
A	source/blender/python/manta_full/source/preprocessor/main.cpp
A	source/blender/python/manta_full/source/preprocessor/merge.cpp
A	source/blender/python/manta_full/source/preprocessor/parse.cpp
A	source/blender/python/manta_full/source/preprocessor/prep.h
A	source/blender/python/manta_full/source/preprocessor/tokenize.cpp
A	source/blender/python/manta_full/source/preprocessor/tokenize.h
A	source/blender/python/manta_full/source/preprocessor/util.cpp
A	source/blender/python/manta_full/source/preprocessor/util.h
A	source/blender/python/manta_full/source/pwrapper/manta.h
A	source/blender/python/manta_full/source/pwrapper/manta_api.cpp
A	source/blender/python/manta_full/source/pwrapper/manta_api.h
A	source/blender/python/manta_full/source/pwrapper/pclass.cpp
A	source/blender/python/manta_full/source/pwrapper/pclass.h
A	source/blender/python/manta_full/source/pwrapper/pconvert.cpp
A	source/blender/python/manta_full/source/pwrapper/pconvert.h
A	source/blender/python/manta_full/source/pwrapper/pvec3.cpp
A	source/blender/python/manta_full/source/pwrapper/pymain.cpp
A	source/blender/python/manta_full/source/pwrapper/pymain.h
A	source/blender/python/manta_full/source/pwrapper/pythonInclude.h
A	source/blender/python/manta_full/source/pwrapper/registry.cpp
A	source/blender/python/manta_full/source/pwrapper/registry.h
A	source/blender/python/manta_full/source/python/defines.py
A	source/blender/python/manta_full/source/shapes.cpp
A	source/blender/python/manta_full/source/shapes.h
A	source/blender/python/manta_full/source/test.cpp
A	source/blender/python/manta_full/source/turbulencepart.cpp
A	source/blender/python/manta_full/source/turbulencepart.h
A	source/blender/python/manta_full/source/util/integrator.h
A	source/blender/python/manta_full/source/util/interpol.h
A	source/blender/python/manta_full/source/util/interpolHigh.h
A	source/blender/python/manta_full/source/util/mcubes.h
A	source/blender/python/manta_full/source/util/quaternion.h
A	source/blender/python/manta_full/source/util/randomstream.h
A	source/blender/python/manta_full/source/util/solvana.h
A	source/blender/python/manta_full/source/util/vectorbase.cpp
A	source/blender/python/manta_full/source/util/vectorbase.h
A	source/blender/python/manta_full/source/vortexfilament.cpp
A	source/blender/python/manta_full/source/vortexfilament.h
A	source/blender/python/manta_full/source/vortexpart.cpp
A	source/blender/python/manta_full/source/vortexpart.h
A	source/blender/python/manta_full/source/vortexsheet.cpp
A	source/blender/python/manta_full/source/vortexsheet.h
M	source/blender/python/manta_pp/CMakeLists.txt
D	source/blender/python/manta_pp/COPYING
D	source/blender/python/manta_pp/Doxyfile.in
D	source/blender/python/manta_pp/INSTALLING
A	source/blender/python/manta_pp/commonkernels.h
A	source/blender/python/manta_pp/commonkernels.h.reg
A	source/blender/python/manta_pp/commonkernels.h.reg.cpp
A	source/blender/python/manta_pp/conjugategrad.cpp
A	source/blender/python/manta_pp/conjugategrad.h
A	source/blender/python/manta_pp/conjugategrad.h.reg
A	source/blender/python/manta_pp/conjugategrad.h.reg.cpp
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/adler32.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/compress.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/crc32.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/crc32.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/deflate.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/deflate.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzclose.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzguts.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzlib.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzread.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzwrite.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/infback.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffast.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffast.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffixed.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inflate.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inflate.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inftrees.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inftrees.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/trees.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/trees.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/uncompr.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/zconf.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/zlib.h
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/zutil.c
D	source/blender/python/manta_pp/dependencies/zlib-1.2.8/zutil.h
A	source/blender/python/manta_pp/edgecollapse.cpp
A	source/blender/python/manta_pp/edgecollapse.h
A	source/blender/python/manta_pp/edgecollapse.h.reg
A	source/blender/python/manta_pp/edgecollapse.h.reg.cpp
A	source/blender/python/manta_pp/fastmarch.cpp
A	source/blender/python/manta_pp/fastmarch.h
A	source/blender/python/manta_pp/fastmarch.h.reg
A	source/blender/python/manta_pp/fastmarch.h.reg.cpp
A	source/blender/python/manta_pp/fileio.cpp
A	source/blender/python/manta_pp/fileio.h
A	source/blender/python/manta_pp/fileio.h.reg
A	source/blender/python/manta_pp/fileio.h.reg.cpp
A	source/blender/python/manta_pp/flip.cpp
A	source/blender/python/manta_pp/flip.h
A	source/blender/python/manta_pp/flip.h.reg
A	source/blender/python/manta_pp/flip.h.reg.cpp
A	source/blender/python/manta_pp/fluidsolver.cpp
A	source/blender/python/manta_pp/fluidsolver.h
A	source/blender/python/manta_pp/fluidsolver.h.reg
M	source/blender/python/manta_pp/fluidsolver.h.reg.cpp
A	source/blender/python/manta_pp/general.cpp
A	source/blender/python/manta_pp/general.h.reg
A	source/blender/python/manta_pp/general.h.reg.cpp
A	source/blender/python/manta_pp/grid.cpp
A	source/blender/python/manta_pp/grid.h
A	source/blender/python/manta_pp/grid.h.reg
A	source/blender/python/manta_pp/grid.h.reg.cpp
A	source/blender/python/manta_pp/gui/customctrl.cpp
A	source/blender/python/manta_pp/gui/customctrl.h
A	source/blender/python/manta_pp/gui/customctrl.h.reg
A	source/blender/python/manta_pp/gui/customctrl.h.reg.cpp
A	source/blender/python/manta_pp/gui/glwidget.cpp
A	source/blender/python/manta_pp/gui/glwidget.h
A	source/blender/python/manta_pp/gui/glwidget.h.reg
A	source/blender/python/manta_pp/gui/glwidget.h.reg.cpp
A	source/blender/python/manta_pp/gui/mainwindow.cpp
A	source/blender/python/manta_pp/gui/mainwindow.h
A	source/blender/python/manta_pp/gui/mainwindow.h.reg
A	source/blender/python/manta_pp/gui/mainwindow.h.reg.cpp
A	source/blender/python/manta_pp/gui/meshpainter.cpp
A	source/blender/python/manta_pp/gui/meshpainter.h
A	source/blender/python/manta_pp/gui/meshpainter.h.reg
A	source/blender/python/manta_pp/gui/meshpainter.h.reg.cpp
A	source/blender/python/manta_pp/gui/moc_customctrl.cxx
A	source/blender/python/manta_pp/gui/moc_customctrl.cxx_parameters
A	source/blender/python/manta_pp/gui/moc_glwidget.cxx
A	source/blender/python/manta_pp/gui/moc_glwidget.cxx_parameters
A	source/blender/python/manta_pp/gui/moc_mainwindow.cxx
A	source/blender/python/manta_pp/gui/moc_mainwindow.cxx_parameters
A	source/blender/python/manta_pp/gui/moc_meshpainter.cxx
A	source/blender/python/manta_pp/gui/moc_meshpainter.cxx_parameters
A	source/blender/python/manta_pp/gui/moc_painter.cxx
A	source/blender/python/manta_pp/gui/moc_painter.cxx_parameters
A	source/blender/python/manta_pp/gui/moc_particlepainter.cxx
A	source/blender/python/manta_pp/gui/moc_particlepainter.cxx_parameters
A	source/blender/python/manta_pp/gui/moc_qtmain.cxx
A	source/blender/python/manta_pp/gui/moc_qtmain.cxx_parameters
A	source/blender/python/manta_pp/gui/painter.cpp
A	source/blender/python/manta_pp/gui/painter.h
A	source/blender/python/manta_pp/gui/painter.h.reg
A	source/blender/python/manta_pp/gui/painter.h.reg.cpp
A	source/blender/python/manta_pp/gui/particlepainter.cpp
A	source/blender/python/manta_pp/gui/particlepainter.h
A	source/blender/python/manta_pp/gui/particlepainter.h.reg
A	source/blender/python/manta_pp/gui/particlepainter.h.reg.cpp
A	source/blender/python/manta_pp/gui/qtmain.cpp
A	source/blender/python/manta_pp/gui/qtmain.h
A	source/blender/python/manta_pp/gui/qtmain.h.reg
A	source/blender/python/manta_pp/gui/qtmain.h.reg.cpp
A	source/blender/python/manta_pp/hginfo.h
A	source/blender/python/manta_pp/kernel.cpp
A	source/blender/python/manta_pp/kernel.h
A	source/blender/python/manta_pp/kernel.h.reg
A	source/blender/python/manta_pp/kernel.h.reg.cpp
A	source/blender/python/manta_pp/levelset.cpp
A	source/blender/python/manta_pp/levelset.h
A	source/blender/python/manta_pp/levelset.h.reg
A	source/blender/python/manta_pp/levelset.h.reg.cpp
A	source/blender/python/manta_pp/mesh.cpp
A	source/blender/python/manta_pp/mesh.h
A	source/blender/python/manta_pp/mesh.h.reg
A	source/blender/python/manta_pp/mesh.h.reg.cpp
A	source/blender/python/manta_pp/movingobs.cpp
A	source/blender/python/manta_pp/movingobs.h
A	source/blender/python/manta_pp/movingobs.h.reg
A	source/blender/python/manta_pp/movingobs.h.reg.cpp
A	source/blender/python/manta_pp/noisefield.cpp
A	source/blender/python/manta_pp/noisefield.h
A	source/blender/python/manta_pp/noisefield.h.reg
A	source/blender/python/manta_pp/noisefield.h.reg.cpp
A	source/blender/python/manta_pp/particle.cpp
A	source/blender/python/manta_pp/particle.h
A	source/blender/python/manta_pp/particle.h.reg
A	source/blender/python/manta_pp/particle.h.reg.cpp
A	source/blender/python/manta_pp/plugin/advection.cpp
A	source/blender/python/manta_pp/plugin/extforces.cpp
A	source/blender/python/manta_pp/plugin/initplugins.cpp
A	source/blender/python/manta_pp/plugin/kepsilon.cpp
A	source/blender/python/manta_pp/plugin/meshplugins.cpp
A	source/blender/python/manta_pp/plugin/pressure.cpp
A	source/blender/python/manta_pp/plugin/vortexplugins.cpp
A	source/blender/python/manta_pp/plugin/waveletturbulence.cpp
A	source/blender/python/manta_pp/pwrapper/manta.h
A	source/blender/python/manta_pp/pwrapper/manta_api.cpp
A	source/blender/python/manta_pp/pwrapper/manta_api.h
A	source/blender/python/manta_pp/pwrapper/pclass.cpp
A	source/blender/python/manta_pp/pwrapper/pclass.h
A	source/blender/python/manta_pp/pwrapper/pconvert.cpp
A	source/blender/python/manta_pp/pwrapper/pconvert.h
A	source/blender/python/manta_pp/pwrapper/pvec3.cpp
A	source/blender/python/manta_pp/pwrapper/pymain.cpp
A	source/blender/python/manta_pp/pwrapper/pythonInclude.h
A	source/blender/python/manta_pp/pwrapper/registry.cpp
A	source/blender/python/manta_pp/pwrapper/registry.h
A	source/blender/python/manta_pp/python/defines.py
A	source/blender/python/manta_pp/python/defines.py.reg
A	source/blender/python/manta_pp/python/defines.py.reg.cpp
D	source/blender/python/manta_pp/resources/pause.png
D	source/blender/python/manta_pp/resources/play.png
D	source/blender/python/manta_pp/resources/res.qrc
D	source/blender/python/manta_pp/resources/stop.png
D	source/blender/python/manta_pp/scenes/simpleplume.py
A	source/blender/python/manta_pp/shapes.cpp
A	source/blender/python/manta_pp/shapes.h
A	source/blender/python/manta_pp/shapes.h.reg
A	source/blender/python/manta_pp/shapes.h.reg.cpp
D	source/blender/python/manta_pp/source/cmake/FindTBB.cmake
D	source/blender/python/manta_pp/source/commonkernels.h
D	source/blender/python/manta_pp/source/conjugategrad.cpp
D	source/blender/python/manta_pp/source/conjugategrad.h
D	source/blender/python/manta_pp/source/cuda/buoyancy.cu
D	source/blender/python/manta_pp/source/cuda/cudatools.h
D	source/blender/python/manta_pp/source/cuda/curlnoise.cu
D	source/blender/python/manta_pp/source/cuda/curlnoise.h
D	source/blender/python/manta_pp/source/cuda/meshtools.cu
D	source/blender/python/manta_pp/source/cuda/particle.cu
D	source/blender/python/manta_pp/source/cuda/turbulence.cu
D	source/blender/python/manta_pp/source/edgecollapse.cpp
D	source/blender/python/manta_pp/source/edgecollapse.h
D	source/blender/python/manta_pp/source/fastmarch.cpp
D	source/blender/python/manta_pp/source/fastmarch.h
D	source/blender/python/manta_pp/source/fileio.cpp
D	source/blender/python/manta_pp/source/fileio.h
D	source/blender/python/manta_pp/source/flip.cpp
D	source/blender/python/manta_pp/source/flip.h
D	source/blender/python/manta_pp/source/fluidsolver.cpp
D	source/blender/python/manta_pp/source/fluidsolver.h
D	source/blender/python/manta_pp/source/general.cpp
D	source/blender/python/manta_pp/source/general.h
D	source/blender/python/manta_pp/source/grid.cpp
D	source/blender/python/manta_pp/source/grid.h
D	source/blender/python/manta_pp/source/gui/customctrl.cpp
D	source/blender/python/manta_pp/source/gui/customctrl.h
D	source/blender/python/manta_pp/source/gui/glwidget.cpp
D	source/blender/python/manta_pp/source/gui/glwidget.h
D	source/blender/python/manta_pp/source/gui/mainwindow.cpp
D	source/blender/python/manta_pp/source/gui/mainwindow.h
D	source/blender/python/manta_pp/source/gui/meshpainter.cpp
D	source/blender/python/manta_pp/source/gui/meshpainter.h
D	source/blender/python/manta_pp/source/gui/painter.cpp
D	source/blender/python/manta_pp/source/gui/painter.h
D	source/blender/python/manta_pp/source/gui/particlepainter.cpp
D	source/blender/python/manta_pp/source/gui/particlepainter.h
D	source/blender/python/manta_pp/source/gui/qtmain.cpp
D	source/blender/python/manta_pp/source/gui/qtmain.h
D	source/blender/python/manta_pp/source/kernel.cpp
D	source/blender/python/manta_pp/source/kernel.h
D	source/blender/python/manta_pp/source/levelset.cpp
D	source/blender/python/manta_pp/source/levelset.h
D	source/blender/python/manta_pp/source/mesh.cpp
D	source/blender/python/manta_pp/source/mesh.h
D	source/blender/python/manta_pp/source/movingobs.cpp
D	source/blender/python/manta_pp/source/movingobs.h
D	source/blender/python/manta_pp/source/noisefield.cpp
D	source/blender/python/manta_pp/source/noisefield.h
D	source/blender/python/manta_pp/source/particle.cpp
D	source/blender/python/manta_pp/source/particle.h
D	source/blender/python/manta_pp/source/plugin/advection.cpp
D	source/blender/python/manta_pp/source/plugin/extforces.cpp
D	source/blender/python/manta_pp/source/plugin/initplugins.cpp
D	source/blender/python/manta_pp/source/plugin/kepsilon.cpp
D	source/blender/python/manta_pp/source/plugin/meshplugins.cpp
D	source/blender/python/manta_pp/source/plugin/pressure.cpp
D	source/blender/python/manta_pp/source/plugin/vortexplugins.cpp
D	source/blender/python/manta_pp/source/plugin/waveletturbulence.cpp
D	source/blender/python/manta_pp/source/preprocessor/code.cpp
D	source/blender/python/manta_pp/source/preprocessor/code.h
D	source/blender/python/manta_pp/source/preprocessor/codegen_kernel.cpp
D	source/blender/python/manta_pp/source/preprocessor/codegen_python.cpp
D	source/blender/python/manta_pp/source/preprocessor/main.cpp
D	source/blender/python/manta_pp/source/preprocessor/merge.cpp
D	source/blender/python/manta_pp/source/preprocessor/parse.cpp
D	source/blender/python/manta_pp/source/preprocessor/prep.h
D	source/blender/python/manta_pp/source/preprocessor/tokenize.cpp
D	source/blender/python/manta_pp/source/preprocessor/tokenize.h
D	source/blender/python/manta_pp/source/preprocessor/util.cpp
D	source/blender/python/manta_pp/source/preprocessor/util.h
D	source/blender/python/manta_pp/source/pwrapper/manta.h
D	source/blender/python/manta_pp/source/pwrapper/manta_api.cpp
D	source/blender/python/manta_pp/source/pwrapper/manta_api.h
D	source/blender/python/manta_pp/source/pwrapper/pclass.cpp
D	source/blender/python/manta_pp/source/pwrapper/pclass.h
D	source/blender/python/manta_pp/source/pwrapper/pconvert.cpp
D	source/blender/python/manta_pp/source/pwrapper/pconvert.h
D	source/blender/python/manta_pp/source/pwrapper/pvec3.cpp
D	source/blender/python/manta_pp/source/pwrapper/pymain.cpp
D	source/blender/python/manta_pp/source/pwrapper/pymain.h
D	source/blender/python/manta_pp/source/pwrapper/pythonInclude.h
D	source/blender/python/manta_pp/source/pwrapper/registry.cpp
D	source/blender/python/manta_pp/source/pwrapper/registry.h
D	source/blender/python/manta_pp/source/python/defines.py
D	source/blender/python/manta_pp/source/shapes.cpp
D	source/blender/python/manta_pp/source/shapes.h
D	source/blender/python/manta_pp/source/test.cpp
D	source/blender/python/manta_pp/source/turbulencepart.cpp
D	source/blender/python/manta_pp/source/turbulencepart.h
D	source/blender/python/manta_pp/source/util/integrator.h
D	source/blender/python/manta_pp/source/util/interpol.h
D	source/blender/python/manta_pp/source/util/interpolHigh.h
D	source/blender/python/manta_pp/source/util/mcubes.h
D	source/blender/python/manta_pp/source/util/quaternion.h
D	source/blender/python/manta_pp/source/util/randomstream.h
D	source/blender/python/manta_pp/source/util/solvana.h
D	source/blender/python/manta_pp/source/util/vectorbase.cpp
D	source/blender/python/manta_pp/source/util/vectorbase.h
D	source/blender/python/manta_pp/source/vortexfilament.cpp
D	source/blender/python/manta_pp/source/vortexfilament.h
D	source/blender/python/manta_pp/source/vortexpart.cpp
D	source/blender/python/manta_pp/source/vortexpart.h
D	source/blender/python/manta_pp/source/vortexsheet.cpp
D	source/blender/python/manta_pp/source/vortexsheet.h
A	source/blender/python/manta_pp/test.cpp
A	source/blender/python/manta_pp/turbulencepart.cpp
A	source/blender/python/manta_pp/turbulencepart.h
A	source/blender/python/manta_pp/turbulencepart.h.reg
A	source/blender/python/manta_pp/turbulencepart.h.reg.cpp
A	source/blender/python/manta_pp/util/integrator.h
A	source/blender/python/manta_pp/util/interpol.h
A	source/blender/python/manta_pp/util/interpolHigh.h
A	source/blender/python/manta_pp/util/mcubes.h
A	source/blender/python/manta_pp/util/quaternion.h
A	source/blender/python/manta_pp/util/randomstream.h
A	source/blender/python/manta_pp/util/solvana.h
A	source/blender/python/manta_pp/util/vectorbase.cpp
A	source/blender/python/manta_pp/util/vectorbase.h
A	source/blender/python/manta_pp/vortexpart.cpp
A	source/blender/python/manta_pp/vortexpart.h
A	source/blender/python/manta_pp/vortexpart.h.reg
A	source/blender/python/manta_pp/vortexpart.h.reg.cpp
A	source/blender/python/manta_pp/vortexsheet.cpp
A	source/blender/python/manta_pp/vortexsheet.h
A	source/blender/python/manta_pp/vortexsheet.h.reg
A	source/blender/python/manta_pp/vortexsheet.h.reg.cpp

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

diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt
index 4d7f7dd..550e791 100644
--- a/source/blender/python/CMakeLists.txt
+++ b/source/blender/python/CMakeLists.txt
@@ -20,4 +20,5 @@ add_subdirectory(intern)
 add_subdirectory(generic)
 add_subdirectory(mathutils)
 add_subdirectory(bmesh)
+#choose "manta_pp" for preprocessed files or "manta_full" for full manta module 
 add_subdirectory(manta_pp)
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 1709862..3a2a09d 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -82,7 +82,7 @@
 #include "../bmesh/bmesh_py_api.h"
 #include "../mathutils/mathutils.h"
 
-#include "../manta_pp/source/pwrapper/manta_api.h"
+#include "../manta_pp/pwrapper/manta_api.h"
 
 
 /* for internal use, when starting and ending python scripts */
diff --git a/source/blender/python/manta_pp/CMakeLists.txt b/source/blender/python/manta_full/CMakeLists.txt
similarity index 98%
copy from source/blender/python/manta_pp/CMakeLists.txt
copy to source/blender/python/manta_full/CMakeLists.txt
index df6cf3d..d04c70b 100755
--- a/source/blender/python/manta_pp/CMakeLists.txt
+++ b/source/blender/python/manta_full/CMakeLists.txt
@@ -248,7 +248,9 @@ SET(INCLUDE_PATHS
    source/pwrapper
    source/cuda
    source/util
-   ${CMAKE_CURRENT_BINARY_DIR}/${PP_PATH}/source   
+   ${CMAKE_CURRENT_BINARY_DIR}/${PP_PATH}/source  
+   #PR added  
+   ${CMAKE_CURRENT_BINARY_DIR}/${PP_PATH}/source/plugin  
 )
 
 # Multithreading
@@ -554,9 +556,10 @@ MESSAGE("PR_12")
 
 SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${F_LINKADD} ")
 SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${F_LINKADD} ")
-MESSAGE("PR_13")
+MESSAGE("PR_13 including parths: ${INCLUDE_PATHS}")
+
+include_directories( ${INCLUDE_PATHS})
 
-include_directories( ${INCLUDE_PATHS}) 
 link_directories( ${F_LIB_PATHS} ) 
 MESSAGE("PR_14")
 #list(REMOVE_DUPLICATES SOURCES)
diff --git a/source/blender/python/manta_pp/COPYING b/source/blender/python/manta_full/COPYING
similarity index 100%
rename from source/blender/python/manta_pp/COPYING
rename to source/blender/python/manta_full/COPYING
diff --git a/source/blender/python/manta_pp/Doxyfile.in b/source/blender/python/manta_full/Doxyfile.in
similarity index 100%
rename from source/blender/python/manta_pp/Doxyfile.in
rename to source/blender/python/manta_full/Doxyfile.in
diff --git a/source/blender/python/manta_pp/INSTALLING b/source/blender/python/manta_full/INSTALLING
similarity index 100%
rename from source/blender/python/manta_pp/INSTALLING
rename to source/blender/python/manta_full/INSTALLING
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/adler32.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/adler32.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/adler32.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/adler32.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/compress.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/compress.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/compress.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/compress.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/crc32.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/crc32.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/crc32.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/crc32.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/crc32.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/crc32.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/crc32.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/crc32.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/deflate.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/deflate.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/deflate.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/deflate.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/deflate.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/deflate.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/deflate.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/deflate.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzclose.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/gzclose.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzclose.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/gzclose.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzguts.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/gzguts.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzguts.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/gzguts.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzlib.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/gzlib.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzlib.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/gzlib.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzread.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/gzread.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzread.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/gzread.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzwrite.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/gzwrite.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzwrite.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/gzwrite.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/infback.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/infback.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/infback.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/infback.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffast.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/inffast.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffast.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/inffast.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffast.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/inffast.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffast.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/inffast.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffixed.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/inffixed.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffixed.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/inffixed.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/inflate.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/inflate.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/inflate.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/inflate.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/inflate.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/inflate.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/inflate.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/inflate.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/inftrees.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/inftrees.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/inftrees.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/inftrees.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/inftrees.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/inftrees.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/inftrees.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/inftrees.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/trees.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/trees.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/trees.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/trees.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/trees.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/trees.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/trees.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/trees.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/uncompr.c b/source/blender/python/manta_full/dependencies/zlib-1.2.8/uncompr.c
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/uncompr.c
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/uncompr.c
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/zconf.h b/source/blender/python/manta_full/dependencies/zlib-1.2.8/zconf.h
similarity index 100%
rename from source/blender/python/manta_pp/dependencies/zlib-1.2.8/zconf.h
rename to source/blender/python/manta_full/dependencies/zlib-1.2.8/zconf.h
diff --git a/source/blender/python/manta_pp/dependencies/zlib-1.2.8/zlib.h b/source/blender/python/manta_

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list