Blender Git Loki

Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusion

Removed/Disabled some deprecated code.

Fix building of OpenCL kernel

Merge branch 'master' into temp-cycles-microdisplacement

Reduce maximum number of image textures on Fermi architecture

The new __patches texture takes up a slot and goes past the limit on Fermi
cards which was causing the kernel to fail to build. To fix this there is now
one less image texture available.

Now free'ing maps. Removed unused function.

Added support for painting multiple leaves at the same time. Also added brush strength and curve fade support. I need to optimize how maps for vert->loops are generated and destroyed.

Merge branch 'master' into soc-2016-layer_manager

Fix new layer based object drawing not used

Fix undo/redo and file read/write

Storing/reading objects assigned to layers currently crashes since there's no support for GHash read/write. Will probably change into array/listbase since GHash doesn't make much sense here anyway.

new liquid inflow approach based on multiple raycasts

Merge branch 'master' into soc-2016-cycles_images

Some WIP code for CUDA half support.

* CUDA actually only supports half and half2, but still we should use these instead of own declarations.
* For CPU we define half and half4 ourselves, for CUDA I still have to add half4 then.

CUDA doesnt compile anymore with this commit, need to fix this later.

fixed missing sign from previous commit

Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusion

Curves: Auxiliary functions for the Extend operator

This commit contains part of the foundations for the Bezier curve Extend operator. This implementation is based on an addon created previously by a Blender user.

Some of the implemented functions may have use outside of the scope of the Extend operator. Therefore, they may be relocated and renamed in a future commit.

reverting to old liquid inflow - previous approach results in inaacurate meshes (interpolation issue)

Fix compile error on Windows.

crash fix for starting sim after convert to objects in external mode

stale data was around in depsgraph, missed a relations update tag call

Merge branch 'master' into alembic_basic_io