Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/space_view3d/space_view3d.c

New template for grease pencil material previews

This is the initial step to prepare the use of material previews in the topbar as color selector.

We need a new template to hide some elements of the default template.

Still the preview of the material is not available.

UI: Add different parameter to TopBar for each type of brush

UI: Make Tool text shorter and less repetitive

Fix broken Tools group by previous commit.

The commit f468302660d220b01e838f0d7b70323bd0ff1d33 broke the groups for mesh tools.

This is a temp hack to make the tools work, but need a better solution.

Fix error in toolbar for mesh modes

The category array must be shared.

Replace text for Show/Hide panel

Before the name was too long, but with new design is ok.

Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr-tess-modifier

Make vertex wig sampling reflect the method in the paper

DO NOT MERGE - revert opensubdiv commit 9a0634a253421c02dbb6d2864db49e4d382ea2a3

Initial port to 2.8

Added time reporting and optimized osd_eval creation

Revert "OpenSubdiv: Make more flexible C-API to specify FVar interpolation"

This reverts commit c17cb50ae282f0f04d399ac4f9fa2f3c5eb548bb.

Revert "OpenSubdiv: Fix wrong topology refiner cast"

This reverts commit d0920fba1609b864adb38f0ec469e6b1581890e4.

Fix problem with Eraser cursor

The blend modes were using the GPU functions but the parameters were the old GL mode.

GPU replace missing in previous commit

Replace gl* functions by GPU*

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Merge branch 'blender2.8' into greasepencil-object

Fix: All GP Paint brushes were getting added to the same group in the toolbar