Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2018 08:39:57 +0000 (18:39 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2018 08:39:57 +0000 (18:39 +1000)
1  2 
source/blender/editors/gpencil/gpencil_convert.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_data_transfer.c
source/blender/editors/object/object_relations.c