[Bf-blender-cvs] [cb7dc508ecd] soc-2020-info-editor: Merge branch 'arcpatch-D6926' into soc-2020-info-editor

[Mateusz Grzeliński]

Commit: cb7dc508ecd5d68eae9317d9eb72dbe655ff848c
Author: Mateusz Grzeliński
Date:   Mon Jun 8 12:25:52 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBcb7dc508ecd5d68eae9317d9eb72dbe655ff848c

Merge branch 'arcpatch-D6926' into soc-2020-info-editor

# Conflicts:
#	source/blender/makesdna/DNA_space_types.h

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



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