Blender Git Loki

Merge branch 'alembic' into gooseberry

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

Fix for deflector force fields in cache simulation.

Make sure forces always push outward when not using "double sided"
deflectors (default).

Merge branch 'master' into gooseberry

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

Merge branch 'master' into gooseberry

Gooseberry: Fix crash of backdrop widget in graph space

This fix should actually happen in wiggly-widgets branch but it's now
has some commits which are not in gooseberry and merging them night
be not really safe.

Fix really stupid own mistake that caused leakage of timers.

Merge branch 'master' into gooseberry

Tentative fix for flickering particle duplis, when using "pick random"
with a dupligroup and distributed rendering.

The particle duplis were generated using the global RNG (BLI_rand). This
is unstable once scenes become a bit more complex and objects are
evaluated in multiple threads.

This patch is not in master, because it changes the look of existing
particle setups.

New shrinkwrap modifier for cached hair data.

This is experimental. It might work for simple collision-like features,
by keeping goal positions for hair above the mesh surface. However, the
nature of nearest-point lookup on meshes means that the goal position
can flip to the other side of a mesh rapidly, which would lead to
strong forces and unstable behavior.

This code should be seen as an experiment.

Merge branch 'master' into gooseberry

Merge branch 'alembic' into gooseberry

Conflicts:
intern/cycles/blender/blender_sync.h

Alembic: Fix compilation error after recent task/threads changes

For some reason CMake worked just fine, but SCons was giving issues.

Merge branch 'master' into gooseberry

Merge branch 'master' into alembic

Conflicts:
intern/cycles/blender/blender_sync.h

Merge branch 'alembic' into gooseberry

Fix for own bug in rB6d1fecc15254381420fdb1290eb611ed14cddaae.

The UV and vertex color attribute export function expects the curve data
arrays to contain only a single attribute at a time. They must be
cleared before filling in data for each UV/vcol attribute.

Merge branch 'alembic' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
source/blender/editors/interface/interface_utils.c

Use quaternions instead of 3x3 matrices to store rotation of strand
roots in Alembic caches.

This kind of data is a big chunk of massive hair systems. Test files
could be reduced this way by almost 30%.

Merge branch 'alembic' into gooseberry