Blender Git Loki

Merge branch 'master' into alembic

Conflicts:
intern/cycles/blender/blender_sync.h

Fix for own bug in rB6d1fecc15254381420fdb1290eb611ed14cddaae.

The UV and vertex color attribute export function expects the curve data
arrays to contain only a single attribute at a time. They must be
cleared before filling in data for each UV/vcol attribute.

Use quaternions instead of 3x3 matrices to store rotation of strand
roots in Alembic caches.

This kind of data is a big chunk of massive hair systems. Test files
could be reduced this way by almost 30%.

Accidentally deleted a return statement in previous commit.

Fixed minor memory leak when the bake operator exits early without
freeing allocated data.

Optional filter group pointer in Cache Library for limiting cache
content.

This group is only used for the baking operator (like the datatypes
filter), but has no effect when reading caches. The UI now uses a box
layout to reflect this.

Removed unused function for constructing a list of objects used by a
cache library.

This was no longer how cache libraries are used anyway, they now cache
based on duplilists, which can be more than recursive groups.

Support for UV and vertex color attributes of cached strands data.

Unlike particles, the Strands data stores UV coordinates and vertex
colors explicitly as a per-strand (const) property. This means Cycles
does not have to know the details of how particles map themselves to
a changing mesh surfaces (which is very complicated and fraught with
broken use cases and bugs). The UVs and colors are stored once for each
strand, since they are not expected to change over time (strands being
fixed to the mesh surface).

Alembic: Make group's write_sample() threaded

The idea is to evaluate derived meshes in multiple threads, which will
reduce overall write_sample() time. We can't make all routines threaded
in there because alembic's file IO can't be threaded.

In any case, this change gives 2x speedup of exporting render resolution
version of Franck here.

Alembic: Add utilities for task pool and scoped lock

Currently unused, but handy for some further development.

Alembic: Minor tweak to disabling hdf5 if alembic does not support it

Mainly just suppresses meaningless message if hdf5 is already disabled in cmake.

Alembic: Solve compilation error with strict compiler flags

Use a wrapper around alembic read_sample function calls, to catch
Alembic exceptions and prevent crashing.

Alembic can throw exceptions on relatively common and uncritical errors,
such as mismatching properties in files which don't fit the expected
schema. These cases should now be handled gracefully and simple reject
the cache file with an error message.

Support CD_MTFACE as a dummy layer in Alembic exports.

Customdata layers also store some base information, such as "active"
layer for rendering. This information is needed currently for syncing
particle UV and MCol data in cycles, even though the MTFACE layer type
itself is pretty much deprecated.

Support for Loop UV and vertex color customdata attributes.

The exclusion mask for meshes in Alembic caches now is a bit more
specific as well, to not bluntly exclude all bmesh attributes.

Fixed missing increment of when writing out CD_ORIGSPACE_MLOOP data.

Don't disable hair sim during the render pass.

This otherwise prevents hair simulation motion showing up in renders.

The Alembic structure will have to be redesigned anyway. The current
concept of storing two separate entire scenes for viewport/render will
be replaced by a per-object detail level system. This allows performing
hair simulation only once and still use different resolutions etc.
where appropriate.

Merge branch 'master' into alembic

Alembic: Use task pool for calculating DM for dupli object data

Alembic: Typo sneaked in last moment before previous commit