Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 26 May 2017 13:32:42 +0000 (23:32 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 26 May 2017 13:32:56 +0000 (23:32 +1000)
commit7d7c5135d7b2f811229631e263cf22b300d95806
tree5883e7ac622e7ffcdf45e084bc1b46e9d9274625
parent3b311b7cb2320cc7a86f23c6d5ffa0747a045818
parentac66fb193f80847fd4fc1b46413ebb3199ebbf1b
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/customdata.c