Blender Git Loki

Cloth solver data for edit mode is unused, removed it.

Merge branch 'hair_immediate_fixes' into gooseberry

Merge branch 'hair_immediate_fixes' into hair_system_solver

Conflicts:
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_270.c
source/blender/makesdna/DNA_cloth_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/physics/BPH_mass_spring.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit.h
source/blender/physics/intern/implicit_blender.c

Merge branch 'hair_system' into hair_system_solver

Merge branch 'master' into hair_system_solver

Merge branch 'master' into hair_system

Merge branch 'master' into hair_immediate_fixes

WIP code reshuffling for widgets

Manipulator now uses the widget system (no operators used).

Widgets use a similar notification system as operators. It might be
worth using WM_BREAK messages like the rest of the handlers. For now
this should do.

Move manipulator handler to the widget system.

Draw manipulator from widget callback (handling still done separately)

Merge branch 'master' into wiggly-widgets

Fix for scons files missing physics include folder.

Yet another attempt to solve OSX issues, restore sequence sounds too, or
sounds get added to two sequence and file descriptors leak

Added separate damping for bending springs.

The bend damping factor was hardcoded to the same value as the stiffness.
Now it has its own factor in the settings and button in hair dynamics.

Minor corrections to the types

New data types for sequencer.

Uses struct hierarchies to reduce the data used per strip.

Also changed sequence -> strip. Might be better to use NSequence for
editing as well.

Merge branch 'master' into terrible_consequencer

Set the length threshold for hair simulation to 10% again (from 1%).

With the default 5 substeps the simulation can otherwise still become
unstable. This is just a preliminary measure anyway until the length
variance can be fixed properly.

Fix for outdated root array size when changing the particle amount
during simulation.