Blender Git Loki

Merge branch 'master' into soc-2019-outliner

Outliner: Only draw active highlight when syncing selection

When synced selection is off, it makes no sense to draw
active highlights, especially because they may be out of
sync from view layer active highlights

Merge branch 'master' into soc-2019-openxr

visualize different particle types with vertex colors

Merge remote-tracking branch 'origin/master' into sybren-usd

figure out how to add vertex colors to a new mesh

LANPR: modified "item" into prev/next in lanpr_data_types.h

ability to store attribute defaults in AttributeInfo

Allow emitters to emit multiple types of particles

[Fast import/export] Fixed compilation errors

new ActionInterface class

Rename "distance" to "metric" in voronoi node.

The distance metric enum was named "distance" before, which is very bad since we have functions and variables called "distance". We renamed that to "metric", however, DNA and RNA names are still the same for backeward compatibility.

Merge remote-tracking branch 'origin' into soc-2019-cycles-procedural

Add a function for setting socket availability

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/gpencil_draw_utils.c

remove unused variable

Update attribute arrays based on which attributes are required

particles container has responsibility to allocate attribute arrays again

USD: only write timeSamples when we write animated data

By using the default timecode USD won't even write a single `timeSample`
for non-animated data. Instead, it writes it as non-timesampled. This makes
the USD file more explicit of our intent, and allows for read-time
optimisations.

comment out unused variables