Blender Git Loki

Merge branch 'master' into gooseberry

Fixed incorrect macro for testing build settings.

Indicator for the player (togglable with I key).

Draws a green line where the current frame is in the movie.

Collapsed images:

* Icon of collapsed images is same as a movie
* Size displayed is cummulative size of all images
* Frame range is displayed in the filename

Small cleanup.

- Remove unnecessary forward declarations
- Use MEM_callocN to initialize memory for new caches, would assert due
to OpenVDBCache.filename not being initialized.

Exporter: clip grids based on the density field to save on file size.

Patch by @lukastoenne.

Merge branch 'alembic' into gooseberry

Fix outdated stub factory class for pointcache when Alembic is disabled.

Disable collapse images option after operator ends.

Collapse image sequence feature now uses BLI_path_* functions to detect
filenames.

Fix stupid recent mistake

Merge branch 'master' into gooseberry

Conflicts:
source/blender/makesdna/DNA_object_types.h

dynamic fracture: disabled loading / saving of dynamic mode again, it still has too many issues

Use left aligned text for icon buttons

Merge branch 'UI-graphical-redesign' into UI-experiments

Conflicts:
source/blender/editors/screen/area.c

Merge branch 'master' into UI-experiments

Make clamping able to return to exact previous values.

Merge branch 'master' into UI-graphical-redesign

Add an 'is_color' metadata to set an rgba socket for color grids

dynamic fracture: re-added modified version of speed transfer, it depends now on linear / angular deactivation threshold whether speed is transferred or not (to reduce "jumping" of shards on the ground)