Blender Git Loki

Merge remote-tracking branch 'origin/master' into experimental-build

Subversion bump, and doversion last changes

Merge remote-tracking branch 'origin/master' into multiview

BGE: New VideoTexture.DeckLink object.

This object is analoguous to Texture and is used to send frames out to a
DeckLink card. It is primarly intended to mix computed frames with a video
stream looping through the card for real-time compositing. This is known
as 'keying'.
Currently the implementation is only a stub.

Resurrect `filelist_selection_get()`...

Still not working though.

Merge branch 'asset-experiments' into asset-engine

FileBrowser: add dummy accessor to entries from their uuid.

Needed for assets branch, to be rework seriously later of course.

Merge branch 'cycles_point_density' into gooseberry

Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesrna/intern/rna_particle.c

Support for particle texture color in point density textures.

This works for all pointdensity use cases, BI as well as Cycles.

Particle color influence option for particle textures.

This color is currently only displayed in the viewport (when enabling
"Texture" color mode in the Display settings). It will be used for
controlling the smoke color when using particles for smoke emission.

Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesrna/intern/rna_particle.c

Merge branch 'asset-experiments' into asset-engine

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

FileBrowser: block caching: minor tweak (mostly needed in ae branch actually).

Merge branch 'asset-experiments' into asset-engine

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

FileBrowser: rewrite 'entry selection' code.

Since we do not store anymore ell entries, we cannot use them to hold selection status.

So we now use a ghash in FileList struct, with entry UUID's as keys.

Also cleanuped up / refactored selection handling, filelist.c now features a nice intern
api and all other code uses it instead of accessing directly entries' selflag!

Depagraph: Fix for strict compiler flags in release builds

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenlib/intern/storage.c
source/blender/editors/space_file/filesel.c

Merge branch 'master' into depsgraph_refactor

Merge branch 'master' into cycles_kernel_split

Conflicts:
intern/cycles/kernel/svm/svm_light_path.h

Cycles kernel split: Fix for progressive refine

fix compilation when TRUST_NO_ONE is disabled