Blender Git Loki

GPencil: Add Merge and Convert to Material context menu

GPencil: Create Palettes from Vertex Color

Merge branch 'master' into greasepencil-object

Gpencil: Convert Materials to Vertex Color mode

Instead to use the materials to define colors, this convert the color to use Vertex Color and merge materials by type.

Textured strokes (not stencil mask) and fill not solid are not converted.

Fix a bug in the T34039 hack in case when a modifier key is not mapped.

In order to recover from a transient Focus Out - Focus In disruption
in the middle of a shortcut, which can be caused by certain window
managers, Blender has code that checks which modifier keys are pressed
after Focus In and restores the modifier state based on that.

If one of the Ctrl, Shift, Alt, Super keys is not mapped anywhere
in the active keyboard layout, XKeysymToKeycode returns the invalid
zero keycode, and reading the key state produces garbage, which can
cause an invalid modifier state. Check the return value to avoid this.

Overlay Engine: Edit Text

Overlay Engine: Edit Curve / Surface

Fix T68191: Make-instances-real doesn't select the new instances

2.79 also did this [select the new instances] which was useful.
2.79 also kept the instancer selected [this patch deselects]

Reviewed By: mont29

Maniphest Tasks: T68191

Differential Revision: https://developer.blender.org/D6233

Overlay Engine: Fix warnings

Overlay Engine: Motion Path

- Now working with Alt+B clipping
- Now scalling with DPI setting

Fix Assert from missing UBO bind

Merge branch 'blender-v2.81-release'

Fix active bone flip not activating the wpaint vertex group

Cleanup: Detailed comments on selection helpers & simplify logic

Merge branch 'blender-v2.81-release'

Cleanup: quiet warnings

Merge branch 'blender-v2.81-release'

Merge branch 'blender-v2.81-release'

Merge branch 'blender-v2.81-release'

Merge branch 'blender-v2.81-release'