Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Sep 2017 13:56:19 +0000 (23:56 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Sep 2017 13:56:19 +0000 (23:56 +1000)
commit533ec46efbc533383f80052f8c5057db5ec1348b
treeb8bd76142fa5a1e2f2a8bb7ca0fea93c437fb32f
parentad80bfdab9c82695df240c8b5a5d19a2b5b84254
parentd0344d7b7d619e62bc852c4d00df52cfbfdda544
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/customdata.c
source/blender/editors/interface/interface.c
source/blender/makesrna/intern/rna_mesh.c