[Bf-blender-cvs] [3b52dfe549f] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into temp-lanpr-review

[YimingWu]

Commit: 3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9
Author: YimingWu
Date:   Sat May 30 16:34:11 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9

Merge remote-tracking branch 'origin/master' into temp-lanpr-review

# Conflicts:
#	release/datafiles/locale
#	release/scripts/addons
#	source/blender/blenkernel/intern/lib_query.c

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



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