Blender Git Commits

Use dedicated versions of shapekey eval functions for strands.

Strand shapekeys will be interpreted as delta keys without a basis,
since the basis would be animated and therefore useless for static keys.
To avoid complexity in the already overburdened shapekey functions and
to skip old legacy code, the strands shapekeys now have their own
functions.

Removed some useless old code.

Removed the complicated optional refdata handling from the generic
shape key eval function.

This now goes to a dedicated strands function which can be cleaned up
properly, all the old code can function as before.

Merge branch 'master' into gooseberry

Fixed shape key reference data usage, for applying shape keys on top
of an animated base.

This is necessary for strand shape keys. The basis of the data comes
from the cached animation or simulation results, i.e. we can't use the
fixed basis key or the result would always become static.

Merge branch 'master' into gooseberry

Apply strand shape keys to both the base strand coordinates and the
motion state.

This means shape keys work on the goal positions for hair as well as
the simulation results (hair motion).

If the simulation is created before shape keys are applied, the
resulting sim will be mixed with the shape keys, becoming more rigid
with increased shape weights.

OTOH the shape keys can also be applied to the animation result, before
doing hair simulation. In that case the shape will only affect the goal
positions and the bending shape of the hair, but the hair is otherwise
free to move.

Set the 'from' pointer in Key directly in the init method, so it works
with NULL pointers too.

Added back the deprecated KeyFrom struct in Key, for backward
compatibility.

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/intern/key.c
source/blender/makesdna/DNA_key_types.h

Unified code for identifying unconventional shapekey owners between
gooseberry and alembic branches.

The shapekey code has been modified in both branches, adding particle
shapekeys in gooseberry and cache library shapekeys in alembic. The
two approaches are slightly different, but based on the same idea of
extending the 'from' owner info in Key, so that keys can be used without
a 'from' ID and/or with an index for identification.

This patch unifies the approach in both branches to make it slightly
less messy and avoid merge conflicts.

Ported key owner type code from gooseberry, to better sync both branches.

The shapekey code has been modified in both branches, adding particle
shapekeys in gooseberry and cache library shapekeys in alembic. The
two approaches are slightly different, but based on the same idea of
extending the 'from' owner info in Key, so that keys can be used without
a 'from' ID and/or with an index for identification.

Fix building without FFMPEG

Note - seems fps for movies are only calculated with ffmpeg?

Merge branch 'alembic' into gooseberry

Improved relaxation code for strand lengths in hair edit mode.

Fix for incorrect vertex loops when calculating strands.

This was using vprev from previous strands, leading to spurious changes
on untouched strands when combing.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/windowmanager/intern/wm_playanim.c

Merge branch 'master' into alembic

Merge branch 'alembic' into gooseberry

Use the extended archive writer variant to set the correct start frame
for slices.

Also the time sampling for slice output properties must be passed down
from the output archive, since the input properties use the original
start frame and cycle times.