[Bf-blender-cvs] [f4677547d43] master: Fix early output check in movie clip prefetch

Sergey Sharybin noreply at git.blender.org
Mon Mar 4 15:25:13 CET 2019


Commit: f4677547d430cd16a386094626cbafa23e199ca8
Author: Sergey Sharybin
Date:   Mon Mar 4 15:22:14 2019 +0100
Branches: master
https://developer.blender.org/rBf4677547d430cd16a386094626cbafa23e199ca8

Fix early output check in movie clip prefetch

Was preventing prefetching when clip is offset to a
higher scene frame number than a duration of the clip.

===================================================================

M	source/blender/editors/space_clip/clip_editor.c

===================================================================

diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index f6959dd593c..6d4fd927d76 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -958,8 +958,9 @@ static int prefetch_get_final_frame(const bContext *C)
 	/* check whether all the frames from prefetch range are cached */
 	end_frame = EFRA;
 
-	if (clip->len)
-		end_frame = min_ii(end_frame, clip->len);
+	if (clip->len) {
+		end_frame = min_ii(end_frame, SFRA + clip->len - 1);
+	}
 
 	return end_frame;
 }



More information about the Bf-blender-cvs mailing list