Merging r49300 through r49333 from trunk into soc-2011-tomato
[blender.git] / source / blender / makesdna / DNA_mask_types.h
index 869ce010b078e3762fc79c53ad9f0d505722641c..a789f570c363e3b32ed0b1e4cc6028fe49e99af5 100644 (file)
@@ -178,7 +178,8 @@ enum {
        MASK_BLEND_DARKEN      = 3,
        MASK_BLEND_MUL         = 4,
        MASK_BLEND_REPLACE     = 5,
-       MASK_BLEND_DIFFERENCE  = 6
+       MASK_BLEND_DIFFERENCE  = 6,
+       MASK_BLEND_MERGE       = 7
 };
 
 /* masklay->blend_flag */