Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2018 06:49:34 +0000 (08:49 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2018 06:49:34 +0000 (08:49 +0200)
commitcb22caa8c78ad2f4453a83683c97effb7fde862d
treec3c27a2e2d9a174d5b6fcbee4b0693afdb1f85f5
parent0e0502cbdf9d13a72c96a645c5d886210118ab50
parent18c12803bd8b48b66c2103b3107f68bb5d0287c5
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_edit.c