Blender Git Loki

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
source/blender/makesdna/DNA_gpencil_modifier_types.h
source/blender/makesrna/intern/rna_gpencil_modifier.c

GPencil: Add new parameters to merge materials

Now the user can control de Hue, Saturation and Value range.

Merge branch 'master' into greasepencil-object

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

GPencil: Fix default vertex color

This error was introduced when fix the double default brushes.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GPencil: Add support to Vertex Paint for Eyedropper tool

GPencil: Add small color box to context menu

GPencil: Fix double Brush initialization

GPencil: Hide Edit lines in Vertex Paint mode

GPencil: New Set Vertex Color operator

Merge branch 'master' into greasepencil-object

GPencil: New parameter for Vertex Paint mix

Also some cleanup.

GPencil: Show Vertices in Vertex Paint always

GPencil : Use different color for selected point sin Vertex Paint

GPencil: Show Vertex Opacity in Overlay for Vertex Paint

GPencil: Move move below color wheel in context menu

GPencil: New operators for Vertex Paint

* Levels
* Invert
* Hue Saturation Value
* Bright/Contrast

GPencil: Show Edit points in Vertex Paint

Also added the option to hide edit points when disable Overlays in any mode.