[Bf-blender-cvs] [94fb5199f6c] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 94fb5199f6c49b12ffa8a6e113d5a4605e369874
Author: Antonio Vazquez
Date:   Thu Apr 30 16:43:39 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB94fb5199f6c49b12ffa8a6e113d5a4605e369874

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/presets/keyconfig/keymap_data/blender_default.py
	release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py

===================================================================



===================================================================