diff options
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 1 | ||||
-rw-r--r-- | source/blender/sequencer/intern/proxy.c | 5 | ||||
-rw-r--r-- | source/blender/sequencer/intern/sequencer.c | 9 | ||||
-rw-r--r-- | source/blender/sequencer/intern/sequencer.h | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 6cd87e29c9d..7aeee2740c0 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -170,7 +170,6 @@ struct anim_index *IMB_indexer_open(const char *name) int i; if (!fp) { - fprintf(stderr, "Couldn't open indexer file: %s\n", name); return NULL; } 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 { diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c index f0a45355143..1c7fe927381 100644 --- a/source/blender/sequencer/intern/sequencer.c +++ b/source/blender/sequencer/intern/sequencer.c @@ -66,6 +66,15 @@ /** \name Allocate / Free Functions * \{ */ +StripProxy *seq_strip_proxy_alloc(void) +{ + StripProxy *strip_proxy = MEM_callocN(sizeof(struct StripProxy), "StripProxy"); + strip_proxy->quality = 50; + strip_proxy->build_tc_flags = SEQ_PROXY_TC_ALL; + strip_proxy->tc = SEQ_PROXY_TC_RECORD_RUN; + return strip_proxy; +} + static Strip *seq_strip_alloc(int type) { Strip *strip = MEM_callocN(sizeof(Strip), "strip"); diff --git a/source/blender/sequencer/intern/sequencer.h b/source/blender/sequencer/intern/sequencer.h index 7d7ecbc8178..2a82f966f02 100644 --- a/source/blender/sequencer/intern/sequencer.h +++ b/source/blender/sequencer/intern/sequencer.h @@ -29,12 +29,13 @@ extern "C" { struct Scene; struct Sequence; - +struct StripProxy; /** * Cache must be freed before calling this function * since it leaves the seqbase in an invalid state. */ void seq_free_sequence_recurse(struct Scene *scene, struct Sequence *seq, bool do_id_user); +struct StripProxy *seq_strip_proxy_alloc(void); #ifdef __cplusplus } |