Blender Git Loki

Merge branch 'alembic' into gooseberry

Fix for cache simulation force fields, these were not added up.

Merge branch 'master' into gooseberry

Conversion for shape keys back to strands data from edit mode.

Strands edit data conversion wants the raw shape key number (starting
at 1), converts to index internally.

Gooseberry: Attempt to fix compilation error with scons

Fix for own error in merging alembic branch, breaking shape keys.

Both the gooseberry and alembic branches contain extensions of the Key
DNA structure, in order to make it work for particles and caches
respectively. This was giving badly resolved conflicts on merge.

Merge branch 'master' into alembic

Merge branch 'master' into gooseberry

Moved the child deformation for strands out of the core cache reading
function.

This is a feature for display in the viewport and rendering, which has
nothing to do with the core cache reading functionality. In the general
case you'd want the child data to remain unmodified.

Support metadata display in sequencer overdrop

Getting a consistent look here is difficult since editors apply their
own scaling. ideally, here we would have a consistent look with constant
font size but this is still to be realized in master and needs some
extra thought.

Merge branch 'alembic' into gooseberry

Fix fo 'simple' particle hair matrix calculation.

The parent matrix is used for single-parent children ('simple'), in
which case the pa->num_dmcache has to be used to get the correct
position on subdivided meshes.

Merge branch 'master' into gooseberry

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

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/key.c
source/blender/editors/object/object_shapekey.c
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesrna/intern/rna_key.c

Store MSurfaceSample data in hair strands for mapping to a mesh.

This data is not strictly necessary for the strands drawing or rendering
or even hair simulation, because the hair root offset and rotation is
already cached explicitly. However, the strand edit mode needs this
information to correctly apply length constraints.

Fix for threaded dupli cache generation from groups.

Strands require a valid DerivedMesh for calculating their root matrix
and surface mapping. The scheduler tasks were created such that strands
would be calculated while the DM task was not finished yet, leading to
missing DM data.

Alembic: Quick fixes for strict compiler flags

Alembic support for MSurfaceSample customdata.

Take transformation into account between the duplicator and strands
object.

The strand edit mode uses the local space of the active object, which
is the duplicator (and dupli cache owner). The strands data is in local
space of the original particle system object however, so have to
convert. This is a very hackish solution, using the first instance of
the strands data, which only works for single instance data.