Blender Git Loki

Fix a number of small errors in area coordinate handling

For example collapsing the lower part of the topbar with 2x interface scale
would hide the top-bar header region. There were also more asserts when changing
window size and moving area edges afterwards (same assert as in T55298).
Fixes are similar to e626998a262ebe4f.

With all the recent fixes I've done, area geometry handling should be stable
again. Let's hope I'm right :)

Cleanup: Add/use function to get area width/height from area vertices

This used to be rather cryptic and it was easy to forget the `+ 1` which in fact
is needed to get the correct width/height, see e626998a262ebe4f. This should
also fix some minor off-by-one errors.

Fix T54524: keyframe and driver colors not showing in shape key list.

This reverts commit 357b72e0a7d4a270bf1273102595446ccca16259 which caused
the issue, we need a better fix for that cosmetic issue from T50862. For
now displaying keyframes and drivers is the more important one.

Fix memory leak when using scroll-bars

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Merge branch 'blender2.8' into greasepencil-object

Cleanup: Remove unused argument in recursive function

Cleanup: naming in MOD_utils.

Cleanup: Moar DM busting, mostly cleaning up MOD_utils.

Fix unnecessary empty space in shading popover.

Rename "guide" curves to "fiber" curves.

Guide curves should be a higher-level concept. All fibers should have their
own curve control points, with subdivision on the GPU.

Annotations: Restore 3D View support for annotations (WIP)

Initial support for getting annotations to show up in the 3D
viewport again. WIP and slightly hacky, but it restores basic
working functionality so we can focus on polishing the "new" parts.

Ultimately, the way these callbacks are integrated into the
drawing loop will probably need to change. For example,
* Perhaps we might need a full overlay engine for this one case
(as for motionpaths), though that may also be overkill, and would
further split the code in different places.
* The draw order (relative to manipulators) needs review. It probably
should be below both sets of manipulators, not sandwiched between them.

Other notes:
* For this to work, we currently need to use the original (non-evaluated)
scene data, or else we don't get the newly drawn strokes, as the
scene->gpd stuff isn't copied by COW yet.

Annotations Keymap: Restore D-RMB for eraser

Cleanup: Remove redundant code + note some code issues to fix

Fix: Merge conflict with background resolution

Cycles: change AO node default to 16 samples and only local off.

Workbench: Spherical Harmonics tests

Added a compile directive in order to test SH4 in stead of SH2Win.
For now I disabled SH4, it is a bit more clear, but has a small
performance impact. Will check later for a better approach

Cleanup: remove another bunch of DM usages, includes etc.

Merge branch 'master' into soc-2018-hair-shader

Week 7 merge: no issues

Fix T55645: broken particle Use Count option for instancing objects.

There is now a manual refresh button on the panel to update the list
of objects in case it changes, and it also gets refreshed when changing
the collection or toggling the use count option.

This is a bit more manual but the previous code of refreshing the
list while evaluating the depsgraph was unreliable.

This also fixes it to take properly take into account visibility, and
to work with linked collections for which index writing was missing.