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

[Mateusz Grzeliński]

Commit: 90f9883a35fba83f9afa7eb6d2dc1c3622687581
Author: Mateusz Grzeliński
Date:   Wed Jul 1 15:42:57 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB90f9883a35fba83f9afa7eb6d2dc1c3622687581

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

# Conflicts:
#	source/blender/windowmanager/intern/wm_files.c

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



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