Blender Git Loki

Merge branch 'master' into id_override_static

Set sculpt cursor when enter in sculpt mode

More missed renaming

Rename other uses of probe -> lightprobe

Rename probe -> lightprobe for eevee as well

Rename probe to lightprobe

Hide VIEW option for stroke placement

This option is not logic in the new environment. Keep line for future uses

Set Xray mode to 3D space by default

reset automerge (distortion, exceeded) in external mode now too on startframe

UI: Move show points to display panel

This option is not used all the time and moving we keep layer panel cleaner

UI: Add missing pressure button

This button was removed in a previous commit.

UI: Rename Drawing Brush Thickness to Radius

Fix error with select sculpt brush with keys

When press 3, the brush 4 was selected. Fixed the error and reorganized brushes.

more tweaks for automerge

Merge branch 'blender2.8' into greasepencil-object

Fix problem with Ctrl + Tab for GP objects

Merge branch 'master' into soc-2017-sculpting_improvements
Keep the branch updated to make merging it easier later.

Remove support of lnorspacearray in editmesh undo/redo, fix memleak.

Supporting lnorspacearray in undo/redo would require a deep copy of lnor
spaces, not only a shallow copy of top struct. And it would eat a fair
amount of memory, think we'd rather recompute those on undo for now!

Also, fixed memory leaked by not correctly freeing lnorspace array on
BMesh deletion.

Do not include BKE_mesh.h in bmesh_class.h

We absolutely avoid such include unless totally mandatory, here we can
simply keep lnorspaces array a pointer in BMesh struct, and allocate it
on demand. Also, was breaking bmesh tests building.

Note: this totally breaks undo/redo, but previous code was utterly
wrong here as well (shallow copy of lnorspaces, ending up sharing whole
internal memory -> crash garanteed ;) ). Think we can skip that struct
for undo/redo for now at least, we can rebuild it in those cases imho...

Merge branch 'master' into soc-2017-normal-tools