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:
authorClément Foucault <foucault.clem@gmail.com>2022-01-25 20:51:46 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-01-25 20:51:46 +0300
commitbe4f593758c5913705b43fa092ee0294b4e1bb0a (patch)
tree3177ea0dbbfe7fd7626335369ae00883f4ebad1f /source/blender/sequencer/intern/proxy.c
parenta9d9ec0586d0a48a2c9bd363db8985fee84ab584 (diff)
parentc89d6b095301e7f7870233091c178fdc78ba54ae (diff)
Merge branch 'master' into tmp-workbench-shader-create-infos
Diffstat (limited to 'source/blender/sequencer/intern/proxy.c')
-rw-r--r--source/blender/sequencer/intern/proxy.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/sequencer/intern/proxy.c b/source/blender/sequencer/intern/proxy.c
index 2cb2ba13fb5..cc0ea0634a3 100644
--- a/source/blender/sequencer/intern/proxy.c
+++ b/source/blender/sequencer/intern/proxy.c
@@ -601,10 +601,7 @@ void SEQ_proxy_set(struct Sequence *seq, bool value)
if (value) {
seq->flag |= SEQ_USE_PROXY;
if (seq->strip->proxy == NULL) {
- seq->strip->proxy = MEM_callocN(sizeof(struct StripProxy), "StripProxy");
- seq->strip->proxy->quality = 50;
- seq->strip->proxy->build_tc_flags = SEQ_PROXY_TC_ALL;
- seq->strip->proxy->build_size_flags = SEQ_PROXY_IMAGE_SIZE_25;
+ seq->strip->proxy = seq_strip_proxy_alloc();
}
}
else {