Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_primitive.c

GP: Primitive: Fkey to size brush

GP: Primitive: Add MMB to confirm

GP: Primitive: RMB does not cancel previous strokes

Based on GP team feedback.

GP: Primitive: Fix flickering when using a noise brush

Previously, the random values were generated every draw, now they are generated once.

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

# Conflicts:
# source/blender/makesdna/DNA_lamp_types.h
# source/blender/makesdna/DNA_scene_types.h

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

GP: Primitive: Chord shape

Similar to Arc but based on a chord. Can create bulbous curves.

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

GP: M key only must works for Arcs

GP: Remove L keymap

Change the Tool using a keymap is not the best solution. The right way is use a different tool.

GP: Make C key works only with curves

If we enable this key in Arc it looks the curve and Arc and the same tool, but they are different, so to change the tool use toolbar not a keymap.

GP: Change F keymap to M keymap

F means fill, M for mirror is better.

GP: Replace A keymap by E keymap to be consistent.

GP: Remove C key for Line primitive

It's weird to have this option in lines because mix with arcs. For Arcs and Curves the C key is very useful.

Some changes in bottom text too.

GP: More control points more transparent

This helps to see the extremes of the stroke.