Blender Git Loki

Merge remote-tracking branch 'origin/blender2.8' into temp-udim-images

Support active tile selection without an active image

Merge branch 'master' into blender2.8

Fix error in previous merge

I did a stupid error when merged the file.

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Revert "Fix wrong engine name"

This reverts commit 7c3c2561705afb2c7eae905df727f9861248737b.

Cleanup: style

Cleanup: style

Cleanup: spurious formatting

Merge branch 'master' into soc-2018-hair-shader

Week 7 merge: preparing for cleanup

UI: shorten labels to avoid clipping

Remove empty gradient definitions in new theme

MSVC doesn't support

Remove empty gradient definitions in new theme

MSVC doesn't support

Temp fix to compile

There is a problem with the generator for themes, and this is a temp fix while Campbell fix the generator,

Temp fix to compile theme

UI: tweak status bar layout to make it less jumpy.

Keymap on the left, messages and jobs in the middle, stats on the right.

Better default values for hair guides.

UI: some renaming for more clear/consistent cursor keymaps in status bar.

There's much more work to be done here, this is just fixing some obvious ones.

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Merge branch 'blender2.8' into greasepencil-object