Blender Git Loki

Merge branch 'master' into blender2.8

Cycles: Primary rays in branched path tracing now accumulate volume intersections to allow overlapping volumes to be traversed in one single ray march.

Add ED_object_editmode_exit_ex

Allow exiting editmode from non-active scene.

Cycles: Implement index output for hair node

This is like the only way to add variety to hair which is created
using simple children. Used here for the hair.

Maybe not ideal, but the time will show.

Chnages to use OCIO

Fix T54064: Can't create new Cycles materials

Was caused by object mode removal

Cleanup Style

Changed by error in previous commit

Fix undo modes and mode changes

Now the Ctrl+Z does not undo the mode.

Object Mode: remove Scene.obedit for RNA

Object Mode: Loop over objects for ED_editors_exit

We could loop over active objects but this ensures don't miss any
and avoids complicated context checks.

Object Mode: remove Scene.obedit

Add ED_screen_window_find, BKE_workspace_edit_object

Merge branch '28' into temp-scene-obedit-remove

Object Mode: remove use of Scene.obedit

Add ED_screen_window_find, BKE_workspace_edit_object

Merge branch '28' into temp-scene-obedit-remove

Merge branch 'blender2.8' into asset-engine

Object Mode: remove Scene.obedit for 3D View

Chnage lasso eraser keymap to Ctrl+Alt

Object Mode: pass edit-object to outliner drawing

Also add 'OBEDIT_FROM_EVAL_CTX' macro.

Object Mode: pass edit-object to UV API

Merge branch '28' into temp-scene-obedit-remove