diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-27 16:08:35 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-27 16:08:35 +0300 |
commit | 408515810e99d40a6dd53c3d50f1e4be7eb52c87 (patch) | |
tree | 0aaf16e6011b472bb3b12d92c996268b58ec3080 /source/blender/blenkernel/BKE_sequencer.h | |
parent | 3bd6c8bfa256793170a21130d398c16da1192473 (diff) | |
parent | 9b42b3e11462e96bf24970971ab181122c6b33df (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_sequencer.h')
-rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 532334c31ff..2264167eca1 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -421,12 +421,22 @@ struct Sequence *BKE_sequencer_add_sound_strip(struct bContext *C, ListBase *seq struct Sequence *BKE_sequencer_add_movie_strip(struct bContext *C, ListBase *seqbasep, struct SeqLoadInfo *seq_load); /* view3d draw callback, run when not in background view */ +/* NOTE: Keep in sync with V3D_OFSDRAW_* flags. */ +enum { + SEQ_OFSDRAW_NONE = (0), + SEQ_OFSDRAW_USE_BACKGROUND = (1 << 0), + SEQ_OFSDRAW_USE_FULL_SAMPLE = (1 << 1), + SEQ_OFSDRAW_USE_GPENCIL = (1 << 2), + SEQ_OFSDRAW_USE_SOLID_TEX = (1 << 2), + SEQ_OFSDRAW_USE_CAMERA_DOF = (1 << 3), +}; + typedef struct ImBuf *(*SequencerDrawView)( - const struct EvaluationContext *eval_ctx, struct Scene *, - struct ViewLayer *view_layer, struct Object *, int, int, - unsigned int, int, bool, bool, bool, - int, int, bool, const char *, - struct GPUFX *, struct GPUOffScreen *, char[256]); + const struct EvaluationContext *eval_ctx, struct Scene *scene, + struct ViewLayer *view_layer, struct Object *camera, int width, int height, + unsigned int flag, unsigned int draw_flags, int drawtype, int alpha_mode, + int samples, const char *viewname, + struct GPUFX *fx, struct GPUOffScreen *ofs, char err_out[256]); extern SequencerDrawView sequencer_view3d_cb; /* copy/paste */ |