Blender Git Loki

Merge branch 'alembic' into gooseberry

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

Revert "Disabled the goal spring that is supposed to stabilize roots."

This reverts commit 1b32ac9779c709918c3bf9d46e9e4bb1892dd8bc.

The goal spring is not working as intended, but is better than having
no bending force at the roots at all. Needs a better solution (virtual
root vertex).

Fix for incorrect sub-stepping in the strands hair sim solver.

The code was copied from the old cloth solver, which used a while loop.
Ended up using double step increments, which screwed up some
calculations ...

Fix for initialization of effector velocities.

Disabled the goal spring that is supposed to stabilize roots.

There are larger bugs still roaming free which need to be solved first.
Goal springs also are inherently unstable because the solver can not
properly estimate their Jacobian.

Merge branch 'alembic' into gooseberry

Fix for crash when using cache file paths without slashes in them.

Merge branch 'alembic' into gooseberry

Fix for potential NULL pointer access when looking up strands data from
caches.

The 'find' function was returning a bool value, but this does not
guarantee non-null pointers. Removed the return value to avoid
confusion, now callers should simply check the returned pointers.

Change of cache filter group behavior to allow partial caching.

The filter group was used by omitting any object instances that were
not in the group. This reduces the cache size, but it also entirely
skips objects.

Now the filter group only prevents writing of the actual object data,
but still allows storing dupli instances and dummy entries in the cache.
Any objects from cached dupli lists that don't have cached data (mesh or
strands) will now use the original object data instead.

Merge branch 'alembic' into gooseberry

Fix for running bake operator in background mode without a job.

The cache bake operator would always create a job in the window manager.
However, when running in background mode via a script, the operator can
not be modal and the script would return right after starting the job.
Then Blender is stopped and the baking job with it.

To prevent this the operator now only runs in a job when executed from
the invoke function (or when 'use_job' is set explicitly).

Drag type force field for keeping hairs "stuck" to a mesh surface.

Merge branch 'alembic' into gooseberry

Merge branch 'master' into gooseberry

Hide regular strands when the duplicator object is in hair edit mode.

Don't use the refkey for calculating shape deltas, but only for the base
shape.

Shape keys distinguish between the base shape (shape without any keys)
and the individual reference shapes for each shape key (which define
the delta offsets). For strand shapes, which have to work on top of
animation, the base shape must be the original cache result rather than
a static shape, but the delta for each keyblock is still calculated
wrt. an explicit shape.

Merge branch 'alembic' into gooseberry

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".

Merge branch 'master' into gooseberry