Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 6 May 2018 16:35:39 +0000 (18:35 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 6 May 2018 16:35:39 +0000 (18:35 +0200)
commita3e74acd9ee2879898389cb9d33950f44494932e
tree7d821b4c8b2076542e12b0afef1c7950570bb291
parentc769b1a5533bb0fcf04452cde4d81dd77f7ae03b
parent046904e3fc6d5a9b10215d97ffc71f08bce37a41
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_add.c