Blender Git Loki

Fix T56195: Typo in BLI_array_utils.h.

Fix Cycles headless render failing, after grease pencil merge.

Now it should at least succeed when there are no grease pencil objects.

Some more minor typo fixes in comments.

Fix more merge stupid leftover, and some build warnings.

Fix issues after last 2.8 merge.

Merge branch 'blender2.8' into soc-2018-bevel

Conflicts:
release/scripts/addons
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/space_outliner/outliner_draw.c

Cleanup: Remove ToDo comment

Fix context problem when render in background mode

Bug reported by Sergey.

Cleanup: Replace "Move Color" to "Assign Material"

Fix T56187: Crash using cursor tool in Edit/Sculpt and Weight Paint mode

The transform tried to calculate the multiframe falloff, but there was not any stroke to do that.

Merge branch 'master' into blender2.8

Cleanup: remove unused array member

UI: add 3D view check for grease pencil tool

RNA: add space_type to tool

UI: correct grease pencil placement text

Keymap: use Q key for quick menu in gpencil mode

Note, the keys for changing line display are now more obscure
(Shift-Q, Shift-Alt-Q), and might be changed.

Merge branch 'master' into blender2.8

Cleanup: declare vars or make static

Merge branch 'master' into blender2.8

Move 'View3D.flag3' options into 'gp_flag'.

DNA: remove View3D.flag3

Having 'flag, flag2, flag3' is getting out of hand especially
when we support increasing the size of types.

Make flag2 into an int.

Note, this looses the 'show world' option,
but it's not such an important setting.