Blender Git Loki

Merge branch 'master' into gooseberry

Conflicts:
intern/cycles/kernel/svm/svm.h

Merge branch 'alembic' into gooseberry

Only use string properties from the cachelib for metadata.

Using ints and floats would require prefixing the Alembic metadata
keys, which becomes messy and ambiguous. Encoding other data types as
strings can be done on the python side as well.

Have to use IDP_ReplaceInGroup to overwrite ID properties that already
exist.

Python UI fix for displaying int and float properties as labels.

Added missing break statements.

Display extra metadata for the cache input archive.

Use ID property groups for storing and loading metadata associated to
Alembic archives.

Two separate property groups for metadata are used (so that reading
caches does not overwrite metadata for output caches).

Merge branch 'alembic' into gooseberry

Write metadata to caches (application name, date of creation, user
description).

Cache library output archives now have a description string next to them
that gets written into the archive.

Display basic metadata of a cache archive in the cache library input
settings.

Silence compiler errors by returning a default value for vector
interpolation.

Support for an optional semantics argument when interpolating cached
properties.

This is necessary to distinguish e.g. vector semantics (linear vs. slerp
interpolation for positional/normal vectors). It would be simpler to
do this based purely on types, but the typing of common Alembic
properties is not sufficiently unique. Semantics arguments are enum
values, that can be omitted if the default interpolation should be used.

Interpolation code for reading Alembic cache samples on subframes.

This features is needed for motion blur. All properties with position
semantics (transform matrices, mesh and curve vertex locations, etc.)
need to be interpolated for fractions of full frames, in order to
reproduce the motion and deformation correctly.

Alternatively we could store subframe time sampling for this subset of
properties. However, this would increase the amount of data stored,
and it might actually show artifacts from subframe interpolation in
Blender which is not visible to animators otherwise and should be
ignored.

Make use of the subframe value in Scene when reading from cache archives.

Subframes are necessary when interpolating values.

Use the Alembic generic chrono_t type internally for reading from
archives, instead of Blender frame values.

This is easier to use for interpolation, the frame value is really only
required externally, before and after reading a sample.

Merge branch 'master' into gooseberry

Gooseberry: Workaround stupidness of MSVC with strict flags

Merge branch 'alembic' into gooseberry

Moved child strand deformation into the general cache processing
function.

Strands processing now has 3 main steps:
1) apply parent modifiers
2) deform child strands
3) apply child modifiers