Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna/DNA_mask_types.h')
-rw-r--r--source/blender/makesdna/DNA_mask_types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h
index 60bc3ee0ffc..e7322263a6b 100644
--- a/source/blender/makesdna/DNA_mask_types.h
+++ b/source/blender/makesdna/DNA_mask_types.h
@@ -173,7 +173,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 */