svn merge ^/trunk/blender -r42918:42920
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 11:20:45 +0000 (11:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 11:20:45 +0000 (11:20 +0000)
commitf7609ed5f598359a7bfd99f0e63b27ed08d93184
tree30dbbdc2e424f87c2b7129c27b4db11476a8b5cd
parentff2eb8d72f5cad83e16edcc22c6d4340e3ad72c9
parent0b00bb236ccc65d9861bbe6e9c50cb989117c9ee
svn merge ^/trunk/blender -r42918:42920
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_modifier_types.h