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)
commit07afa420f2f273c58d6d054b9026c92e0ac98785
treeaa15508d641ef30f6ae6b9877eabf5be4cc6eb85
parent974c161b5077398bf79e57d4b9c4775619a8375f
parent1f02209957fc8afde957b48f1be41fc399a725b0
svn merge ^/trunk/blender -r42920:42927
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_mesh_types.h