Blender Git Loki

Follow up fix for bend stiffness curve map versioning.

The DNA lookup for pointers is a bit weird, it expects "CurveMapping" as
the type name, but then the variable field becomes
"*bend_stiffness_mapping".

Cycles kernel split: Remove unused/unwanted declaration

Cycles kernel split: Avoid unnecessary structure reshuffle

Saves 12 bytes per shader data actually.

Merge branch 'master' into gooseberry

Cycles kernel split: Avoid unnecessary arguments from more functions

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.

Cycles kernel split: Avoid adding extra arguments to shadow_blocked()

This way it's guaranteed non-split kernel is exactly the same, and also
localizes changes to a single file only without touching existing path
tracing code.

Cycles kernel split: Avoid having duplicated wireframe function

It was only used because of address space mess. Now it's solved by using
temporary variable which is betetr than duplication and could be solved
with OpenCL 2.0.

Merge branch 'master' into alembic

Merge branch 'alembic' into gooseberry

Version fix for bend stiffness curve mapping.

Cycles kernel split: Remove unwanted whitespace changes

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 'master' into cycles_kernel_split

Cycles Kernel Split: Kill some more whitespace changes to mkae diff more clear.

Merge branch 'master' into UI-experiments

Make it clearer that the dictionary stores collections of previews

Merge branch 'alembic' into gooseberry

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