Blender Git Loki

Cleanup: unnecessary includes.

Refactor code in multi-append/link operator.

Avoid writing a big chunck of code doing nearly the same thing twice...

Fix check to see if a frame is out of range.

Was doing AND instead of OR...

Add OPENVDB_USE_BLOSC definition.

Due to a bug in OpenVDB we have to set this. Though this is fixed in the
current development version, and once the next stable release is out
those defines will be removed.

Merge branch 'alembic' into gooseberry

Allow external object targets for the cache shrinkwrap modifier.

Simplify matrix computation.

WIP more AE/uuid in append/link operator.

Remove dead code.

Import grids for playback now works.

It is still commented out due to the need of a good cache (reading)
system.

Fix typos in metadata reading.

Set vector type when converting a grid.

Set caches' reader and writer to NULL when reading a file.

Fix grids' names mismatch when reading a file.

Merge branch 'alembic' into gooseberry

Presets for cached hair simulations.

This requires some modifications to the existing preset python class.
Serializing curve mappings can not be done with a simple property
assignment.

Also the fact that operator confirm popups drop all layout context
pointers means that we have to store the modifier name in the operator
in order to apply the preset to the correct modifier.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/windowmanager/intern/wm_playanim.c

dynamic fracture: do reset after settings changes and clean up constraints now too in dynamic fracture events

Blenderplayer:

* Add space key to easily start-stop the player.
* Keep old behaviour of stopping when scrubbing.
* Sound scrubbing can be heard now even when scrubbing after pausing.

Merge branch 'alembic' into gooseberry