diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-28 15:36:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-28 15:36:01 +0400 |
| commit | 3ec212fd71ee5b8aed165d4361f0c9d0f7152b9e (patch) | |
| tree | bc8b6511ecc33769d9b4a35248c436c335ee28ba /source/blender/makesdna/DNA_mask_types.h | |
| parent | f405d8fa5353cf0c839b44105048251fd4a1a481 (diff) | |
patch [#32195] MASKS: Canonical Porter Duff algorithm for merge missing.
from Troy Sobotka (sobotka)
This gives nicer blending then 'ADD', setting as default for new masks.
Diffstat (limited to 'source/blender/makesdna/DNA_mask_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mask_types.h | 3 |
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 */ |