Blender Git Loki

Ignore the display/render settings of the cachelibrary when doing
simulations.

Otherwise the child strands and/or motion state can be missing and lead
to incomplete output caches.

BGE DeckLink: Upgrade to Decklink version 10.4.

Smoke: Updated mantaflow sources

Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c

init GL state tracking *after* clearing viewport

Clear function doesnâ??t use state tracking, sets GL directly.

Add uuids ghash to filelist's cache.

Merge branch 'master' into asset-experiments

Merge branch 'master' into gooseberry

Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c

... And fixes for code specific to that branch.

Merge branch 'master' into gooseberry

Small refactor (will allow better factorization with AE listing code).

Caching of FileDirEntry: simplify things, fix some more mem bugs.

Various fixes with asset engine and new code...

Still not working completely, and need small rework in asset-experiments first.

Fix stupid freeing issues.

Merge branch 'master' into gooseberry

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

Merge branch 'master' into gooseberry

Merge branch 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

Merge branch 'master' into gooseberry

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

Merge branch 'alembic' into gooseberry