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)
commit1b5383854811f3aab842c9f10693fec57e28b07f
treeff25499fea46a64a3becc35eac0bd1f8e54d80a3
parent1f78e8607033f64d2c9633517d3b921c61ff431c
parent6eb5b418eee8cb26ac0e3a8bb70cbaf706be4e4d
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/object.c
source/blender/editors/object/object_add.c