diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-12 07:06:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-12 07:06:29 +0300 |
| commit | a60727080f136bbbc3628bcd54d4d78fc95b6a4e (patch) | |
| tree | 8386f890e47488b22445dac8a9d4772b70d285d9 /source/blender/makesdna | |
| parent | 9567529b8f854449e10d59f793f0a225b9a4c495 (diff) | |
| parent | ccb8e78d6cf44de53e7a49386d2b95636c593894 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index ff8737944b2..04d998d8999 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -754,7 +754,7 @@ typedef struct RenderData { /* sequencer options */ char seq_prev_type; - char seq_rend_type; + char seq_rend_type; /* UNUSED! */ char seq_flag; /* flag use for sequence render/draw */ char pad5[5]; @@ -1793,7 +1793,7 @@ typedef struct Scene { #define R_USE_WS_SHADING 0x8000000 /* use world space interpretation of lighting data */ /* seq_flag */ -#define R_SEQ_GL_PREV 1 +// #define R_SEQ_GL_PREV 1 // UNUSED, we just use setting from seq_prev_type now. // #define R_SEQ_GL_REND 2 // UNUSED, opengl render has its own operator now. #define R_SEQ_SOLID_TEX 4 |