[Bf-blender-cvs] [d430af662ce] soc-2020-info-editor: Merge branch 'master' into soc-2020-info-editor

[Mateusz Grzeliński]

Commit: d430af662ced6a3eaa1ff7322e8d939425c0abda
Author: Mateusz Grzeliński
Date:   Tue Jul 28 12:29:21 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBd430af662ced6a3eaa1ff7322e8d939425c0abda

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
#	source/blender/python/intern/bpy_capi_utils.c

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



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