Blender Git Loki

Merge branch 'blender2.7' into master.

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

Fix T57907: Crash with hair when switching between object and edit mode

Was only visible after going in and out (with some strokes inbetween)
hair edit mode. The edit structure was never freed during Blender
session for some reason. Now we free those when leaving particle
edit mode.

Fix T59687: Crash when rendering animation

The issue was caused by shape keys datablock from evaluated mesh
being added to the main database.

This commit makes it so shape keys are not copied for the mesh
used as cage.

GP: Primitive: Fix randomness bias

Update for moving blender2.8 to master.

Update .arcconfig for moving master to blender2.7 branch.

Update for moving master to blender2.7 branch.

Correct orientation pie menu

Missing from recent orientation update.

GP: Cleanup weird thickness scale

This code used old factor, but now this only adds complexity and makes code hard to understand.

Fix T57816: Crash when deleting recently orphaned collection

We were never removing the parent collection from a collection upon removal
of the parent.

Reviewers: mont29

Differential Revision: https://developer.blender.org/D4099

GP: Primitive: Fix merge errors

Fix T59673: wrong B-Bone handle references when duplicating bones.

Also fix and improve symmetrize behavior.

Fix T59709: Light target gizmo scaling

Gizmo was scaling w/ object.

Merge branch 'blender2.8' into greasepencil-object

GP: Move calculated center only for selected strokes

GP: Cleanup API removing extra ID parameter

Fix bug selecting verts in mixed edge/vert mode

Own regression from 2.7x when adding multi-object select support.

RNA: naming, user-preferences -> preferences

3D View: add object color drawing option

Has some advantages over existing options.

- Using material links color to rendering with no way to vary colors
if objects share a material.
- Random gives no control, objects may randomly have the same color,
duplicating an object often changes it's color.