Blender Git Loki

Merge branch 'workspaces' into temp-workspace-multi-window

Merge branch 'blender2.8' into workspaces

Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_view3d/view3d_draw.c

Add GPencil Layer to Scene UI panel

Remove unused parameters in UI panel for GP Object

The type of display is not used in GPencil object.

Merge branch 'master' into temp-select-pick

Testing functions: for mixed_bones_object_selectbuffer

- OpenGL Select for old behavior
- Occlusion Queries for possible new behavior, for now we just do one pass since its possible to avoid the second two.

Merge branch 'blender2.8' into gpencil_2.8

Task scheduler: Cleanup, use BLI_assert() instead of assert()

FFmpeg: Update for the deprecated API in 3.2.x

Should be no functional changes.

Surface Deform Modifier: Respect object transforms at bind time

This slightly changes SDef behavior, by now respecting object transforms
at bind time, thus not requiring the objects to be aligned in their
respective local spaces, but instead using world space.

Edit Mode overlay: Optimisation

Don't generate more verts than we need if we don't render vertex.
Getting a big boost from 12fps to 20fps on my test scene

Edit Mode overlay: Update cache on selection

Bunch of small HMD fixes, removed old now unused preferences

Merge branch 'master' into HMD_viewport

Conflicts:
source/blender/windowmanager/wm.h

Fixup for python UI definition

Fixes for HMD support windows build (thanks LazyDodo)

Multi-View: Map cursor coordinates to visual coordinates

When rendering multi-view in side-by-side or top-bottom mode, we squash
the UI to half of its size and draw it twice on screen. That means the
cursor coordinates used for UI interaction don't match what's visible on
screen.
This commit is a little event system hack (tm) to fix this. It has some
small glitches with cursor grabbing, but nothing to bad.
We'll also use it for viewport HMD support.

D1350, thanks for the feedback @dfelinto!

New OpenHMD 0.3rc version with PSVR, Oculus CV1 and better Vive tracking support.
Also introduces global shader, which will be adjusted based on the variables of the HMD drivers, this will make the manual selection of lens correction shaders obsolete, will be removed in next commit.

The hmd window is currently black before started (due to shader not having the hmd data yet), will be fixed as well.

Merge branch 'master' into HMD_viewport