Blender Git Commits

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

Forgot this last merge

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c

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.

Consider an empty keyblocks list to be a new key, so a Basis shape is
added automatically.

Actual shape key evaluation in the shape key modifier for caches.

Make strand shapes relative by default.

Unused variables.

New 'fromtype' variable in Key to allow handling type-dependent pointer
size and stride.

This is terribly messy due to the legacy code. At some point should be
cleaned up to get rid of the 'from' backpointer and simplify.