svn merge ^/trunk/blender -r49029:49035
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jul 2012 16:26:07 +0000 (16:26 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jul 2012 16:26:07 +0000 (16:26 +0000)
1  2 
source/blender/makesdna/DNA_mask_types.h