diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-12 18:25:29 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-12 18:25:29 +0400 |
| commit | d934ae70a04ce1a095b21e6124bb2198f2907532 (patch) | |
| tree | 343b3dd59e755e00aaecac4d0e25445d1729bcbd /source/blender/makesdna/DNA_scene_types.h | |
| parent | 0364a83771aedc5b2911a74cc5f2ae23d07996c5 (diff) | |
Fix conflict of cycles persistent data flag with freestyle, add reserved
value for freestyle now.
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -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 f4bd855b818..1eabe950e00 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1192,7 +1192,8 @@ typedef struct Scene { #define R_NO_OVERWRITE 0x400000 /* skip existing files */ #define R_TOUCH 0x800000 /* touch files before rendering */ #define R_SIMPLIFY 0x1000000 -#define R_PERSISTENT_DATA 0x2000000 /* keep data around for re-render */ +#define R_EDGE_FRS 0x2000000 /* R_EDGE reserved for Freestyle */ +#define R_PERSISTENT_DATA 0x4000000 /* keep data around for re-render */ /* seq_flag */ #define R_SEQ_GL_PREV 1 |