Blender Git Loki

Fix for hair chain testing in the cloth modifier.

Bending springs are en-bloc and not interleaved with other springs, so
this can't be used as a test for hair roots. Use consecutive indices
instead.

Completed the implementation of bent rest shapes for hair.

Basically follows the Pixar approach from "Artistic Simulation of Curly
Hair".

Gooseberry request: Backdrop for sequencer.

Add missing notification for trimming to stop showing the extensions

Gooseberry request, hide the extensions except when trimming.

Get rid of temporary flags when loading the sound.

Attempt to fix OSX issues (again): cleanup the loading flag for files
that are loading when interrupted.

Target calculation for local non-straight rest shapes.

This is more involved than using simple straight bending targets
constructed from the neighboring segments, but necessary for restoring
groomed rest shapes.

The targets are defined by parallel-transporting a coordinate frame
along the hair, which smoothly rotates to avoid sudden twisting (Frenet
frame problem). The rest positions of hair vertices defines the target
vectors relative to the frame. In the deformed motion state the frame
is then recalculated and the targets constructed in world/root space.

Have to include BLI_utildefines before BKE_collision now to have bool
defined.

change widget code, area now just stores a pointer to the widget list
corresponidng to it.

Merge branch 'master' into hair_immediate_fixes

Conflicts:
source/blender/blenkernel/intern/implicit.c

Merge branch 'master' into wiggly-widgets

Store the waveforms between undo steps when they exist.

Fix compilation in MacOSX

More undo issue solving.

This commit moves sound loading out of library linking. The approach
chosen here is to do lazy initialization by basically validating the
sound before attaching to the scene.

Loading the sound buffer requires a valid Main pointer, which means we
have to pass this around in many places. We might also consider caching
the waveforms in this way too, but for now we're still using the
threaded update.

We'll have to test this somewhat to see if it behaves well..There are
corner cases which might not be covered. Sounds are muted if we undo
during an animation, but this bug existed in master as well.

Merge branch 'master' into terrible_consequencer

Merge branch 'master' into hair_immediate_fixes

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Clear forces and constraints together at the start of the time step,
easier to verify.

Threaded sound strip display data loading.

Sound loading can take too much so move it to a job and continue. This makes
interaction much better. A similar system should be usable for movie previews.

Fix for missing initialization of local cloth modifier inside particle
systems.