Blender Git Loki

Merge branch 'master' into gooseberry

Handle transformation difference between a cached duplicator object and
group objects when editing shape keys.

The edit data (including CD_SHAPEKEY layers) is in the active object's
space, i.e. the duplicator. The original data however is cached strands
data, which is in the dupli object's space. All geometry data needs to
be transformed properly when entering/exiting edit mode.

Merge branch 'master' into alembic

Merge branch 'alembic' into gooseberry

Version fix for bend stiffness curve mapping.

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp

Another curve mapping to control bending stiffness along hair strands.

This already exists for goal springs. Bending stiffness, however, is
preferable to global goal springs for physical realism. Controlling
stiffness in this way allows using bending forces to also simulate
unconventional hair, such as clumpy strands that are thicker and stiffer
at the base.

Note that hair interaction can also be simulated with this tool in some
way, although eventually better methods may be needed for such effects.

Merge branch 'alembic' into gooseberry

Fix for uninitialized values in strand children, leading to random
crashes.

Avoid crashes in pie menus now that strand edit mode forces us to have
more than 8 object modes. We will have to support auto pie expansion at
some point...

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/physics/intern/implicit_blender.c

Fix for NaN error when using zero-length springs in the mass-spring
solver.

This happens when using goal springs, which are now defined as linear
springs between actual vertices and virtual goal vertices. The Jacobian
was not accounting for the possibility of zero rest length.

Cleanup: warnings

Merge branch 'alembic' into gooseberry

Cleanup: quiet warnings

Merge branch 'master' into alembic

Merge branch 'master' into gooseberry

Extended RNA update for shape keys to trigger re-reading of dupli caches.

Merge branch 'alembic' into gooseberry

Fix for missing lib-link of effector weights group pointer.