griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

VSE: Fix type mismatch introduced in rB8bcfa0d1fb9f

Browse Source 
Pass `IMB_Proxy_Size` to `seq_can_use_proxy` and remove duplicate check.
This commit is contained in:
Richard Antalik
2020-06-29 14:24:46 +02:00
parent 18bff53c99
commit 2476c47d75
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/sequencer.c
View File

@@ -1882,19 +1882,11 @@ static ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int c
char name[PROXY_MAXFILE];
StripProxy *proxy = seq->strip->proxy;
const eSpaceSeq_Proxy_RenderSize psize = context->preview_render_size;
const IMB_Proxy_Size psize_flag = seq_rendersize_to_proxysize(psize);
int size_flags;
Editing *ed = context->scene->ed;
StripAnim *sanim;
if (!seq_can_use_proxy(seq, psize)) {
return NULL;
}
size_flags = proxy->build_size_flags;
/* only use proxies, if they are enabled (even if present!) */
if (psize_flag == IMB_PROXY_NONE || (size_flags & psize_flag) == 0) {
if (!seq_can_use_proxy(seq, seq_rendersize_to_proxysize(psize))) {
return NULL;
}