diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-26 17:34:17 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-26 17:34:17 +0400 |
| commit | b61abd4fe0da70ce52acf29c065df2af68e2eabe (patch) | |
| tree | 67eb2668ca92240580a62f4358f7bc464c938b2e /source/blender/makesrna/intern/rna_mask.c | |
| parent | 43bb431548436b6b1699f795acd107de0f6b86a8 (diff) | |
| parent | 25a925ceabb9987c0204df32200b664dcc1aaf44 (diff) | |
Merge from trunk r49908-r50219smoke2
Diffstat (limited to 'source/blender/makesrna/intern/rna_mask.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_mask.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c index f197bf8391d..a6571a2db4f 100644 --- a/source/blender/makesrna/intern/rna_mask.c +++ b/source/blender/makesrna/intern/rna_mask.c @@ -580,7 +580,8 @@ static void rna_def_maskSpline(BlenderRNA *brna) static void rna_def_mask_layer(BlenderRNA *brna) { static EnumPropertyItem masklay_blend_mode_items[] = { - {MASK_BLEND_MERGE, "MERGE", 0, "Merge", ""}, + {MASK_BLEND_MERGE_ADD, "MERGE_ADD", 0, "Merge Add", ""}, + {MASK_BLEND_MERGE_SUBTRACT, "MERGE_SUBTRACT", 0, "Merge Subtract", ""}, {MASK_BLEND_ADD, "ADD", 0, "Add", ""}, {MASK_BLEND_SUBTRACT, "SUBTRACT", 0, "Subtract", ""}, {MASK_BLEND_LIGHTEN, "LIGHTEN", 0, "Lighten", ""}, |