Blender Git Loki

Post merge fixes.

Post merge fixes.

Merge branch 'hair_guides' into tmp_hair_curves

Merge branch 'hair_guides' into hair_guides_grooming

Merge branch 'blender2.8' into hair_guides

Change the uniform strand_res value to strands_len, point_len and elem_len counts.

UI: Fix some error in previous commit

Also rearrange some buttons.

UI: Use icon for Material Link

Follow the same UI design used in commitd2b28a8bf1b4d5abd9507e02702c6dc511ccf2c6

Merge branch 'blender2.8' into greasepencil-object

Rename proc_buf to proc_point_buf to make it consistent with the main control point buffer.

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
build_files/cmake/macros.cmake
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c

UI: Change preview row number to 3

Fix overlay panel missing in Edit/Sculpt/Weight Paint

New preview file for grease pencil

Designed by Matias Mendiola

New property to verify if the material is grease pencil type

UI: Make list of colors preview more compact

Merge branch 'blender2.8' into greasepencil-object

Update preview panel for grease pencil materials

Also some test changes to preview_grease_pencil.blend file

Clenup: PeP8

UI: Add previeww materials panel to grease pencil