Blender Git Commits

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.

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.

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.

Strand edit functions for storing edit data in the Cache Shape Key
modifier and editing in hair edit mode.

Merge branch 'strand_editmode' into alembic

Another fix for mirror editing of strand data.

Currently strand edit mode tool use the object data 'x mirror' flag.
This flag is only available on mesh objects, but the strand editing
can be used for dupli override caches etc. as well. Eventually strand
editing should get it's own independent flag to avoid this problem.

Merge branch 'strand_editmode' into alembic

Fix for call to mirror functions when mirroring is not enabled, giving
warnings.

Merge branch 'strand_editmode' into alembic

Moved particle related functions of the strands edit mode into a
separate file.

This may seem a bit like overkill, but it helps ensure that no particle
depedencies messes up the strand editing code. The same will be done for
other use cases of the strand editing code in the future.

Merge branch 'strand_editmode' into alembic

Added missing CD layer type name for MSurfaceSample.

Merge branch 'strand_editmode' into alembic

Conflicts:
source/blender/editors/space_view3d/drawstrands.c
source/blender/editors/space_view3d/view3d_intern.h

Merge branch 'master' into alembic

Merge branch 'master' into strand_editmode

Conflicts:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_mesh_conv.h

Extended shape key evaluation for cached strands blending.

Now shape keys don't replace the cached base data entirely with the
static Basis shape. Instead the current state as coming from the cache
is interpreted as the variable refkey instead of the Basis key.

The Basis key is in fact redundant, but removing it would require
changing a lot of shared shapekey code, so it's left in for now.