Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 14 Aug 2018 12:10:47 +0000 (14:10 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 14 Aug 2018 12:10:47 +0000 (14:10 +0200)
1  2 
source/blender/blenkernel/intern/object.c
source/blender/editors/object/object_add.c