Blender Git Loki

Merge branch 'master' into greasepencil-object

GPencil: Implement Vertex Overlay and set Vertex as default

Now in Material Overlay mode the Vertex Color is not used and by default the 2D template uses Vertex Mode

GPencil: Make Vertex Color works in Vertex Mode

WIP: Need to disable Vertex Color in Material mode

GPencil: Resorder List icons to be consistent

Now the icons are in the same order in Dopesheet, Layers and Material list

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenloader/intern/versioning_280.c

GPencil: Group all icons after opacity

GPencil: Add emboss only to opacity

GPencil: Enable Sliders by default in 2D template

GPencil: Remove Emboss por Sliders

GPencil: Add N Panel in Dopesheet

GPencil: Fix icon for mask layer in Dopesheet

GPencil: Add layer operators to Dopesheet Header

GPencil: Keep current Tool when reset all brushes

Merge branch 'master' into greasepencil-object

GPencil: Simplify Reset All brushes code

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenloader/intern/versioning_280.c

GPencil: Check NULL Pointer

GPencil: Only reset Brushes of the same tool

GPencil: Add Use Mask to Dopesheet

GPencil: Fix segment fault using Reset All

The tool was null and need to be sure the toolslot is right.