Blender Git Loki

Merge branch 'master' into blender2.8

Remove redundant glColor call

Cycles: Fix the AO replacement option in the split kernel

Currently the code for it was inside the hair-specific part, so it wouldn't be enabled in hairless renders.

UI: Add missing UV tools in the UV/Image Editor Window > Tools tab

Original Author: @xrg
Changes By @blendify

Image of patch: {F284237}

UI: Do not put walk navigation settings inside an if statement

The issue here is that the preferences are still used because both can be accessed from the 3D View, view menu. In the future, it is likely that the old mode will be removed (maybe 2.8?) but for now we want to keep both operational.

Differential revision: https://developer.blender.org/D2320

Object Engine: Fix Selected Group Objects color.

Object Engine: Ported Force Field object drawing.

Gawain: remove PRIM_QUADS_XXX

Thanks @mont29 for finishing off the last few QUADS in blender.

Get rid of last PRIM_QUAD usage, in blf_font.c/blf_glyph.c.

Nuke three remaining uages of PRIM_QUAD in drawobject.c

This was slightly less obvious, especially particle billboard drawing.
That one now requires 1.5 times more space in VBOs and ParticleDrawData
buffers, since we have to draw two triangles per particle, instead of a
single quad... And diagonal of each quad is now drawn in wire mode, not
sure how much we consider this an issue (as in, will this particle draw
code change a lot in future?).

From quick check on the web seems there is no other way to do anyway. :/

Minor cleanup/fix for own rB45f3150c9844326 merge.

GL: use imm* module for 2D cage manipulator

GL/playanim: use immediate mode wrapper, replace glDrawPixels

Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_view3d/drawobject.c

Fix stereoscopic camera volume drawing.

Not sure how we got to that point, but code was drawing twice one side
of the camera volume, and not at all another side!

OpenGL: Fix textureXd deprecated calls.

Draw Manager: Add Manipulator Back.

GPencil 2D Drawing: get rid of PRIM_QUAD_XXX.

Here we can easily use a PRIM_TRIANGLE_STRIP instead!

Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/gpencil/drawgpencil.c

Cycles: Fix race condition in shader attribute for real now

Ended up moving lock in the more centralized space since multiple shaders
can access this map.