diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-05 17:58:41 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-05 17:58:41 +0300 |
| commit | 57329304b061efe756e3a4ce1b828e9a7c7f7030 (patch) | |
| tree | c4a3f9ec01c09314fac7bcb99b437bf0920d19a3 /source/blender/makesdna | |
| parent | 3eaf77fdd34bd9517b650cabde3574361bdc8d21 (diff) | |
| parent | ea0e2f9bd3849b73a29ef1805988fdb0484bc9d4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index d2810efca08..a18c9cf3712 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1834,10 +1834,11 @@ enum { #define R_STAMP_STRIPMETA 0x1000 #define R_STAMP_MEMORY 0x2000 #define R_STAMP_HIDE_LABELS 0x4000 +#define R_STAMP_FRAME_RANGE 0x8000 #define R_STAMP_ALL (R_STAMP_TIME|R_STAMP_FRAME|R_STAMP_DATE|R_STAMP_CAMERA|R_STAMP_SCENE| \ R_STAMP_NOTE|R_STAMP_MARKER|R_STAMP_FILENAME|R_STAMP_SEQSTRIP| \ R_STAMP_RENDERTIME|R_STAMP_CAMERALENS|R_STAMP_MEMORY| \ - R_STAMP_HIDE_LABELS) + R_STAMP_HIDE_LABELS|R_STAMP_FRAME_RANGE) /* RenderData.alphamode */ #define R_ADDSKY 0 |