diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-01-05 02:31:15 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-01-05 02:31:15 +0300 |
| commit | e42e1769b36fddf9b0c161bcb2f7c7f2aeb613eb (patch) | |
| tree | 526fbf9de0eeeb48d057816ad85e04901e952b3f /source/blender/makesdna/DNA_gpencil_types.h | |
| parent | 329879239e6fa358e22bf92180e3d5ff9cee9ba1 (diff) | |
| parent | 82b9e1e3126a5c9de36d57d2d04edd11f00de9a5 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/gpencil/drawgpencil.c
Diffstat (limited to 'source/blender/makesdna/DNA_gpencil_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 180dd5577ce..bb526c41049 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -244,6 +244,7 @@ typedef struct bGPDlayer { float inverse[4][4]; /* inverse matrix (only used if parented) */ char parsubstr[64]; /* String describing subobject info, MAX_ID_NAME-2 */ short partype, pad; + float tintcolor[4]; /* Color used to tint layer, alpha value is used as factor */ float opacity; /* Opacity of the layer */ } bGPDlayer; @@ -275,7 +276,9 @@ typedef enum eGPDlayer_Flag { /* Use high quality fill (instead of buggy legacy OpenGL Fill) */ GP_LAYER_HQ_FILL = (1 << 11), /* Unlock color */ - GP_LAYER_UNLOCK_COLOR = (1 << 12) + GP_LAYER_UNLOCK_COLOR = (1 << 12), + /* always show onion skins (i.e. even during renders/animation playback) */ + GP_LAYER_GHOST_ALWAYS = (1 << 13), } eGPDlayer_Flag; /* Grease-Pencil Annotations - 'DataBlock' */ |