diff options
| -rw-r--r-- | source/blender/editors/space_clip/clip_editor.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 1ee8d21624e..80e8f0d741e 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -1040,7 +1040,7 @@ static int prefetch_get_final_frame(const bContext *C) int end_frame; /* check whether all the frames from prefetch range are cached */ - end_frame = min_ii(sc->user.framenr + U.prefetchframes - 1, EFRA); + end_frame = EFRA; if (clip->len) end_frame = min_ii(end_frame, clip->len); @@ -1059,10 +1059,6 @@ static bool prefetch_check_early_out(const bContext *C) if (clip->prefetch_ok) return true; - /* prefetch is disabled in user preferences */ - if (U.prefetchframes == 0) - return true; - clip_len = BKE_movieclip_get_duration(clip); /* check whether all the frames from prefetch range are cached */ diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 847c9021ec6..95d570dc684 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -3431,7 +3431,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) prop = RNA_def_property(srna, "prefetch_frames", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "prefetchframes"); RNA_def_property_range(prop, 0, 500); - RNA_def_property_ui_text(prop, "Prefetch Frames", "Number of frames to render ahead during playback"); + RNA_def_property_ui_text(prop, "Prefetch Frames", "Number of frames to render ahead during playback (sequencer only)"); prop = RNA_def_property(srna, "memory_cache_limit", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "memcachelimit"); |