diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-11 13:56:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-11 15:07:07 +0300 |
commit | 145298e2d3b2edfc3ddb6d8ccfb3f393232dafb9 (patch) | |
tree | 5462388dd58af828c135c6056267f59b5812bdbf /source/blender/blenkernel | |
parent | 497c35aa7804edc8f16eeff9e82bb3985275a5bd (diff) |
Cleanup: GL Render (simplify internal logic)
Reduce code-paths so improvements to 3D view render apply to sequencer too.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 418179ceab7..350edde407b 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -36,6 +36,7 @@ struct StripColorBalance; struct Editing; struct GSet; struct GPUOffScreen; +struct GPUFX; struct ImBuf; struct Main; struct Mask; @@ -105,6 +106,7 @@ typedef struct SeqRenderData { /* special case for OpenGL render */ struct GPUOffScreen *gpu_offscreen; + struct GPUFX *gpu_fx; int gpu_samples; } SeqRenderData; @@ -417,7 +419,7 @@ typedef struct ImBuf *(*SequencerDrawView)( struct Scene *, struct Object *, int, int, unsigned int, int, bool, bool, bool, int, int, const char *, - struct GPUOffScreen *, char[256]); + struct GPUFX *, struct GPUOffScreen *, char[256]); extern SequencerDrawView sequencer_view3d_cb; /* copy/paste */ diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 45d33e51e18..6d583651e0f 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3222,7 +3222,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq (context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0, use_gpencil, true, scene->r.alphamode, context->gpu_samples, viewname, - context->gpu_offscreen, err_out); + context->gpu_fx, context->gpu_offscreen, err_out); if (ibuf == NULL) { fprintf(stderr, "seq_render_scene_strip failed to get opengl buffer: %s\n", err_out); } |