Blender Git Loki

Greasepencil icons

Note this comes from the greasepencil-object branch, and are merged to help
preventing future merge conflicts.

Also, I renamed the icons for consistency sake. So when this is merged in 2.8
other areas of the code will need to change.

Icons by Matias Mendiola

Revert "Grease-Pencil: Icons"

This reverts commits:

* f0ef3603862 Grease-Pencil: Icons from the grease pencil branch
* 13bf4b3804b Grease-Pencil: Fixup for icons
* fb8c382fa17 Grease Pencil dat files fix

Cleanup: some ED_view3d functions used uppercase D

Merge branch 'master' into blender2.8

Fix Cycles assert when resizing rendererd viewport.

Cycles: change material output displacement to vector.

Previously only scalar displacement along the normal was supported,
now displacement can go in any direction. For backwards compatibility,
a Displacement node will be automatically inserted in existing files.

This will make it possible to support vector displacement maps in the
future. It's already possible to use them to some extent, but requires
a manual shader node setup. For tangent space maps the right tangent
may also not be available yet, depends on the map.

Differential Revision: https://developer.blender.org/D3015

Cycles: add Displacement node.

This converts object space height to world space displacement, to be
linked to the new vector displacement material output.

Differential Revision: https://developer.blender.org/D3015

Fix T53854: branched path tracing correlation bug with transparency in split kernel.

Merge branch 'master' into blender2.8

Cleanup: use doxygen groups for view3d_edit.c

Cleanup: code comment for view3d_viewmatrix_set

Cleanup: CMake whitespace

Manipulator: limit UI for locked views

Cleanup: avoid passing bContext to cameracontrol

Merge branch 'master' into blender2.8

# Conflicts:
# source/blender/editors/screen/screen_ops.c

Merge branch 'master' into blender2.8

Fix screen split refresh issues

`Ctrl` (enable snapping) ans `TAB` (Switching direction) didn't refresh.

Cleanup: sync w/ blender2.8 branch

Also make some args const

Merge branch 'master' into blender2.8

Merge branch 'master' into blender2.8