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)
1  2 
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_add.c