Blender Git Loki

Merge remote-tracking branch 'origin/blender2.8' into temp-dynamic-overrides

UI: Move some panels to toolbar

Remove extra comment in Spanish

Add new context modes for grease pencil

These modes were missing.

Fix Direct coloring calculation

/facepalm

Ref T54796

OSL: initialize geometry as part of the setup

This needs a custom OSL closure. Now it renders, but the colors don't make sense

Ref T54796

Fix more of nirved's OpenCL errors

Thank you nirved for finding and explaining them!

Ref T54796

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_scene.py
source/blender/makesrna/intern/rna_object.c

Merge branch 'soc-2018-volumes' of git.blender.org:blender into soc-2018-volumes

Initial working implementation of tiling for sparse grids.

Cleanup inactive code

Merge branch 'blender2.8' into greasepencil-object

Rework in modifers apply parameters

Instead to pass the Context variable that it was used to get bmain pointer,now bmain is passed as parameter to reduce data and avoid any use of Context.

Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

Remove context parameter

This parameter is removed because Context must be avoided.

Redo mode settings after merge

This code section was changed in the last merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_ops.c

Cleanup: shadowed var

Modify mode set routine to enable grease pencil modes

Now, when you press the numeric key to change mode, if the object is grease pencil, the grease pencil mode is enabled.

Remove keymap for changing brush using numbers

This brush selection wil be replaced with spacebar and a menu.