Blender Git Commits

Fix compile error on Linux

Fix merge error
Streamline Python function name

Fix merge error (still some left)
Fix some path issues

Fix CMake (missing path for zlib)

Fix (one) compile error on MSVC 2013
Fix merge error

Merge remote-tracking branch 'origin/master' into soc-2014-fluid

Conflicts:
.gitignore
intern/cycles/CMakeLists.txt
source/blender/blenkernel/intern/smoke.c
source/blender/python/intern/bpy_interface.c
source/creator/CMakeLists.txt

readGridFromMemory correct dimensionality

unnecessary calls to Mantaflow removed

high-res: inflow data passed in-memory, forces working

low-res: passing obstacles in-memory

low res: errors in grid construction fixed, methods for passing obstacles to Mantaflow added

methods for adding texture values to grids, working for Real type

in-memory passing of force fields

generating grid name from type

passing void pointers for different types of grids

passing inflow adaptive grids without disk files

Manta_API as singletone

debug output, smoke BC

loading influence fields form file

returning to non-static methods