Blender Git Loki

GPU_batch: fix error w/ interior line removal

Caused glitch w/ navigation icons showing inner lines.

Merge branch 'blender2.8' into greasepencil-object

Update preview panel for grease pencil materials

Also some test changes to preview_grease_pencil.blend file

Clenup: PeP8

UI: Add previeww materials panel to grease pencil

Remove Grease Pencil Color Picker

This operator has been replaced by the new preview system.

Update previews when change material

Also split rna update for grease pencil parameters

Keymap: reduce right shift in 2.7x keymap

Keymap: reduce right shift in generated keymaps

Fix grease pencil cache update problems when change material properties

Since commit f84956738ba4e97f30553a675b643f6648afce1d 6/07/2018 12:33, the update of the materials was not working because depsgraph only update the current ID and not all related.

This fix the issue but need a review.

@aligorith Could you take a look and check if this is the best solution, I'm not sure about the fix, maybe we could add a relationship between material and datablock when create a new material.

Merge branch 'master' into blender2.8

Rename operator property from last commit

Restore operator had same option named differently.

Keymap: option to export all keymaps

Useful to store a snapshot of the current keymap state
so changes to the default keymap are ignored.

Also useful for testing keymap export works properly.

Fix merge error and remove old code

This file was wrong from a previous merge and still had code about grease pencil modifiers that was not deleted when the GP modifiers were splitted.

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/object/object_modifier.c

Cleanup: f-string use

Merge branch 'master' into blender2.8

Cleanup: use f-string for addon_utils

Cleanup: minor change for f-string use

Keymap: remove double space in tool-keymap