diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-12 18:09:05 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-12 18:09:05 +0400 |
commit | d7983e3638896e5742fcf1bafe49c49a6b0aa08f (patch) | |
tree | 99470c4aa0896751b9955b5bdb3d3979db73aa91 /source/blender/makesdna | |
parent | f0dcff9aa982d32bcb91e594df49a780ac376b5b (diff) |
Option to overlay mask over the footage
Currently supports only two modes:
- Show alpha channel of the mask
- Multiply footage by the mask, which will give
you final-looking combined image.
TODO: Currently rasterization happens on every
redraw, need to cache rasterized mask
somewhere to make redraw more realtime.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_mask_types.h | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h index 4307ea57f15..a72e287c16f 100644 --- a/source/blender/makesdna/DNA_mask_types.h +++ b/source/blender/makesdna/DNA_mask_types.h @@ -178,6 +178,7 @@ enum { /* SpaceClip->mask_draw_flag */ #define MASK_DRAWFLAG_SMOOTH 1 +#define MASK_DRAWFLAG_OVERLAY 2 /* copy of eSpaceImage_UVDT */ /* SpaceClip->mask_draw_type */ @@ -188,6 +189,12 @@ enum { MASK_DT_WHITE = 3 }; +/* MaskSpaceInfo->overlay_mode */ +enum { + MASK_OVERLAY_ALPHACHANNEL = 0, + MASK_OVERLAY_COMBINED = 1 +}; + /* masklay->blend */ enum { MASK_BLEND_ADD = 0, diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 0478ff567a0..5befaa87e7f 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -546,7 +546,8 @@ typedef struct MaskSpaceInfo /* draw options */ char draw_flag; char draw_type; - char pad3[6]; + char overlay_mode; + char pad3[5]; } MaskSpaceInfo; /* sseq->mainb */ |