Blender Git Loki

Test support for audio in internal player to showcase in weekly :)

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/animation/anim_draw.c

Merge branch 'alembic' into gooseberry

Removed redundant particle matrix calculation when writing hair caches.

This could give a significant improvement in cache baking speed. The
particle matrix is particularly costly to calculate for highly
subdivided meshes.

Cycles: add some quick logging.

Fix missing object drawing update when done exporting.

Fix fluid transformation matrix.

There's a little bit of float precision issue, but I'll call it a day
for now...

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/blenkernel/intern/mesh.c
source/blender/depsgraph/intern/depsgraph_build_relations.cc

Merge branch 'master' into alembic

Conflicts:
build_files/scons/tools/Blender.py
source/blender/blenkernel/intern/mesh.c

Merge branch 'master' into gooseberry

Conflicts:
build_files/scons/tools/Blender.py
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/interface/interface_handlers.c

Merge branch 'alembic' into gooseberry

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

Fix for Drag force fields: was using inverted velocity.

Merge branch 'master' into openvdb_smoke

Zoom to frame options, requested by the Hwoozeberry (dutch translation)
team.

There are 3 options here:

1) Keep range (previous behaviour)
2) Seconds - allows a specified offset in seconds around current frame
3) keyframes - zoom to include a number of keyframes around the cursor

Options 2 and 3 have their own properties to tweak the behaviour and all
options can be found in User Preferences->Interface under the 2D
viewports section.

Number 3 will probably need some refinement so commiting here for the
hwoozeberry team to test first.

Fix for previous commit: the "goal deflect" feature wasn't actually
filtering effectors by type.

Merge branch 'alembic' into gooseberry

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

Optional feature "Goal Deflect" to disable goal forces when hitting a
deflector object.

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