Blender Git Loki

Merge branch 'alembic' into gooseberry

Allow external object targets for the cache shrinkwrap modifier.

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

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

Fix for incorrect update callback in haircut cache modifier, leading
to unrelated property changes.

Merge branch 'alembic' into gooseberry

Fix for the hair strands cutting modifier for caches.

The cutoff value was off by 1.0, due to an invalid increment for the
first vertex.

Cleanup and fix for the cache backend factory, due to changed API
functions.

Merge branch 'alembic' into gooseberry

Simplified render/preview settings for cache baking.

The previous way of selecting preview ("realtime") and render settings
on the cache library level was complicated and confusing. Now there are
just 2 buttons for baking either the preview or render level.
Technically the cache still works the same way, so a 3rd button could be
added for baking both passes into the same cache, should the need arise.

The preview cache now also uses the preview frame range, which should
help in quick testing of hair simulation settings. Render always uses
the scene frame range, like render buttons do.

For display in the viewport and rendering the cache will now use
whatever data is available in the archive. If the cache contains only
render data, the viewport will also draw full render data. Vice versa,
if the cache contains only preview data, this will also be used for
rendering.

Hair toggles for children and motion now are only used for the viewport
display. This simplifies the settings a lot and removes one potential
button to be overlooked.

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/object/object_ops.c

Merge branch 'master' into alembic

Merge branch 'alembic' into gooseberry

Fix for cycles rendering of shortened hair curves.

The strands data can now contain more vertices than are supposed to be
rendered (if cutoff < numverts).

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/intern/key.c
source/blender/bmesh/intern/bmesh_strands_conv.c

Support for cutoff parameters in Alembic files.

These are optional, so older alembic cache versions still work.