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)
commit1f809f34c11d9a492f9500c034d69876792048d7
tree4ab33af57e42baf3f4d1173afdd574ebf22d45ae
parente91bdb10e9c11acf98a2e986d490f2de3c272489
parentab67c6e46b689a703c22c6e04f6d098603e3b49c
Merge branch 'master' into blender2.8
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