Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-11-09 20:49:17 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-11-09 20:49:17 +0400
commitcf503f5c77f0c78234db5335b0e44f7904ca5f3a (patch)
tree874885fb8c3bb36199aa60aaff4b5eab4c84b2ed /source/blender/editors/space_sequencer
parentd25b13d13f22581b7ed107f0774d1bd8c510add4 (diff)
Sequencer: disabled sequencer recursion and corrected rendered preview mode
Sequencer recursion was never actually supported and only gives lots of issues. Disabled it now, so users are not getting confused by semi-working stuff. Also made a correction to rendered sequencer preview, so now using scene strip in it's own sequencer will work properly (it produced black frames before). This required killing compositor jobs since they could be using the same render result as renderer called from sequencer uses. Small improvements could be: - Add slight delay before compositor job starts handling nodes so killing this job would be fast - Tag compositor to be updated after preview was fully rendered.
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index a8103fe2630..37e57a1e850 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -913,6 +913,13 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
unsigned char *display_buffer;
void *cache_handle = NULL;
+ if (G.is_rendering == FALSE) {
+ /* stop all running jobs, except screen one. currently previews frustrate Render
+ * needed to make so sequencer's rendering doesn't conflict with compositor
+ */
+ WM_jobs_kill_all_except(CTX_wm_manager(C), CTX_wm_screen(C));
+ }
+
render_size = sseq->render_size;
if (render_size == 0) {
render_size = scene->r.size;