Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 14 Aug 2018 13:41:11 +0000 (15:41 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 14 Aug 2018 13:41:11 +0000 (15:41 +0200)
commitf19d99c10d252e2bf0b96e23dca12b4bd802f2c5
tree991c8f662b93107ea60f9ed240f0b768f41e93b1
parentcc9255f8a8f1f3cf0f75c13a568dc9458e0ffb8e
parentcab013bc5d4da1c552a3afc4ea980645e9540f46
Merge branch 'master' into blender2.8
source/blender/editors/object/object_add.c