Blender Git Loki

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 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

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

Add asset engine version to uuids list struct.

Add needed asset-related data to Library and ID structs.

Add 'bl_version' to asset engine type, needed to support asset engine in file read/write!

Fix asset engine resetting on every resize!

Only reset AE type to default in `file_init()` if current type is invalid!

Also, better handling of getting default AE type now.

Merge branch 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

Merge branch 'master' into gooseberry

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

Merge branch 'master' into alembic

Cleanup/fix: put 'using namespace' inside ifdef block.

Wrap volume sampling call in a macro.

Merge branch 'asset-experiments' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/makesrna/intern/rna_space.c