diff options
author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-09-05 05:03:42 +0300 |
---|---|---|
committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-09-05 05:03:42 +0300 |
commit | 647f561a628a5d83942b38efc2e22aff9829892f (patch) | |
tree | d3104ed7e8d1f14b2207c547de07a8d05339bf82 /source/blender/makesdna | |
parent | 057821cd5708793450c73b4dd6591f8970dbc41f (diff) | |
parent | 569a13f4b2f8d29f1c0796bd0d4df6a0dbe9ac99 (diff) |
Merge branch 'master' into soc-2016-cycles_denoising
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_cachefile_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_cachefile_types.h b/source/blender/makesdna/DNA_cachefile_types.h index 1cda0233aa8..dd47d63fc19 100644 --- a/source/blender/makesdna/DNA_cachefile_types.h +++ b/source/blender/makesdna/DNA_cachefile_types.h @@ -58,6 +58,7 @@ typedef struct CacheFile { struct AnimData *adt; struct AbcArchiveHandle *handle; + void *handle_mutex; /* Paths of the objects inside of the Alembic archive referenced by this * CacheFile. */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 7e2354e5a99..275a668dcf1 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1769,9 +1769,11 @@ typedef struct Scene { #define R_STAMP_CAMERALENS 0x0800 #define R_STAMP_STRIPMETA 0x1000 #define R_STAMP_MEMORY 0x2000 +#define R_STAMP_HIDE_LABELS 0x4000 #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_RENDERTIME|R_STAMP_CAMERALENS|R_STAMP_MEMORY| \ + R_STAMP_HIDE_LABELS) /* alphamode */ #define R_ADDSKY 0 |