Blender Git Loki

Fix for object matrix sampling with the default 1-second rate.

Merge branch 'alembic' into gooseberry

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

BGE: VideoTexture.DeckLink: add level attribute.

Allows to control the keying level once keying is enabled.

BGE: Support VideoDeckLink in Linux, compiling but not yet working.

Applying the inverse object transform for strand data is not necessary.

Particle pathcache data is in world space, but strands are stored in
object space already.

Basic cache overrides for strand render data in Cycles.

Still buggy, but the basic workflow is there:
When a cache library is used in conjunction with a group duplicator and
it has strands that match the particle systems, Cycles will use the
new Strands structure to construct its internal curves.

DNA file for strands types.

This is not strictly needed because the strands data is only created
at runtime at this point. However, it might be useful to later include
this in blend files.

Also the C++ RNA API has a bug that makes non-DNA collection properties
difficult (the length function is not implemented properly).

Merge branch 'master' into gooseberry

Fix backdrop initialization for opening new Graph Editor

Merge branch 'wiggly-widgets' into gooseberry

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_transform.h
source/blender/windowmanager/intern/wm_operators.c

Merge branch 'master' into gooseberry

Support rendering of big tile sizes

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into wiggly-widgets

Disable VSE ImBuf transform widget for now

(it's only halfway working)

Graph Editor backdrop: Move settings back to already existing panel

(and remove ugly version check)

Merge branch 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

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

Graph Editor backdrop: Fix crash on undo

Merge branch 'asset-experiments' into asset-engine