Blender Git Loki

Merge branch 'master' into greasepencil-object

GPencil: In Vertex Paint mode, Solid Vertex must be set always

In Vertex Paint mode, the Solid shading must be always Vertex

GPencil: Set Solid mode to Material in 2D template

Merge branch 'master' into greasepencil-object

GPencil: Disable VFX in Material shding mode

The VFX must be visible only in Render mode, as Lights.

GPencil: Fix Modifiers patching

Also added a DNA check to avoid double patching for files created with development versions

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GPencil: Don't hide cursor in Weight and Vertex Paint

The cursor must be visible all the time

GPencil: Fix errors after merge

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/BKE_gpencil_modifier.h
source/blender/editors/include/ED_gpencil.h

GPencil: Disable Stroke in Solid Fill default material

GPencil: Rename material Boxes Stroke to Squares Stroke

GPencil: Fix Use cursor Popover

- Fix color in modes not used.
- Enable cursor by default.

GPencil: Remove Substract color for Weight Paint brush

This is not used now.

GPencil: Fix struct alignment error after merge

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/makesdna/DNA_brush_types.h

Merge branch 'master' into greasepencil-object

GPencil: Fix Animation menu

The old animation menu is enough and don't need a new Keyframe menu

GPencil: Cleanup text