Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/draw/intern/draw_manager.c

Merge branch 'blender2.8' into greasepencil-object

Fix merge errors

Merge branch 'blender2.8' into greasepencil-object

Fix merge compiler error

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/makesrna/intern/rna_sculpt_paint.c

Remove duplicate line

Chnages to use OCIO

Cleanup Style

Changed by error in previous commit

Fix undo modes and mode changes

Now the Ctrl+Z does not undo the mode.

Chnage lasso eraser keymap to Ctrl+Alt

Refresh cache if render to refresh viewport

Cleanup: Use macro

Create multiframe buffer only if multisample enabled

Cleanup style

Merge branch 'blender2.8' into greasepencil-object

Cleanup unused code

First try to fix grease pencil object modes

After last merge of 2.8 the object modes was not working. Now we back to previous situation where the user can switch between objects and handle different modes.

Fix multisample error in render

It was checking the wrong default_fb instead of multisample_fb, so it was never created.

Merge branch 'blender2.8' into greasepencil-object