diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-16 20:37:34 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-16 20:37:34 +0300 |
| commit | 5c9c50e13bf9a9ce9f5f2f642ea692c8ce4aa331 (patch) | |
| tree | 6ac822502d6189e4a1f45d01d54a3a3e1dde8004 /source/blender/makesdna | |
| parent | f12ef1202143a9722d806c49e172c782babdbd78 (diff) | |
change the scene opengl sequence rendering to be a global option with rendering and scrubbing settings.
still need to do a do_versions for this to work right without changing settings.
(commit 27442 by Campbell from render25 branch)
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 13 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 283408ba853..a5273e06afb 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -360,6 +360,12 @@ typedef struct RenderData { float fg_stamp[4]; float bg_stamp[4]; + /* sequencer options */ + char seq_prev_type; + char seq_rend_type; + char seq_flag; /* flag use for sequence render/draw */ + char pad5[5]; + /* render simplify */ int simplify_flag; short simplify_subsurf; @@ -838,6 +844,10 @@ typedef struct Scene { #define R_TOUCH 0x800000 /* touch files before rendering */ #define R_SIMPLIFY 0x1000000 +/* seq_flag */ +#define R_SEQ_GL_PREV 1 +#define R_SEQ_GL_REND 2 + /* displaymode */ #define R_OUTPUT_SCREEN 0 @@ -979,6 +989,9 @@ typedef struct Scene { /* simplify_flag */ #define R_SIMPLE_NO_TRIANGULATE 1 +/* sequencer seq_prev_type seq_rend_type */ + + /* **************** SCENE ********************* */ /* for general use */ diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 56d949e9d34..1a73588d6eb 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -275,8 +275,6 @@ typedef struct SpeedControlVars { #define SEQ_USE_PROXY_CUSTOM_FILE 2097152 #define SEQ_USE_EFFECT_DEFAULT_FADE 4194304 -#define SEQ_USE_SCENE_OPENGL 8388608 - /* deprecated, dont use a flag anymore*/ /*#define SEQ_ACTIVE 1048576*/ |