svn merge ^/trunk/blender -r42920:42927
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 13:33:35 +0000 (13:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 13:33:35 +0000 (13:33 +0000)
1  2 
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_mesh_types.h