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)
commit9d79d2bee8f7b3ec3d947e02c50f1efcd6eaeb22
tree953440b6ec2108bf5af1ebfff1a4f20122f8bd4d
parent6dc50955d776a2d426cbe288c1b665e443bc9b30
parentc8029bffd94dc9706b66d9a52626737a971423df
svn merge ^/trunk/blender -r49029:49035
source/blender/makesdna/DNA_mask_types.h