[Bf-blender-cvs] [7efe92f63b4] master: Merge branch 'blender-v2.93-release'

[Philipp Oeser]

Commit: 7efe92f63b4bb68bb46edc2fad66282d5acceed6
Author: Philipp Oeser
Date:   Fri May 14 18:10:12 2021 +0200
Branches: master
https://developer.blender.org/rB7efe92f63b4bb68bb46edc2fad66282d5acceed6

Merge branch 'blender-v2.93-release'

 Conflicts:
	source/blender/editors/object/object_add.c

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



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