From 572c82e74ea3bd9bfea2df8b4527b37c8ef075db Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 8 Aug 2012 11:56:58 +0000 Subject: Code cleanup: make some more functions more meaningful name --- source/blender/blenkernel/BKE_sequencer.h | 4 ++-- source/blender/blenkernel/intern/blender.c | 2 +- source/blender/blenkernel/intern/seqcache.c | 5 ++--- source/blender/blenkernel/intern/sequencer.c | 2 +- source/blender/editors/render/render_internal.c | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 0aee2b07f4a..1e4f7cf105c 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -216,8 +216,8 @@ typedef enum { SEQ_STRIPELEM_IBUF_ENDSTILL } seq_stripelem_ibuf_t; -void BKE_sequencer_stripelem_cache_destruct(void); -void BKE_sequencer_stripelem_cache_cleanup(void); +void BKE_sequencer_cache_destruct(void); +void BKE_sequencer_cache_cleanup(void); /* returned ImBuf is properly refed and has to be freed */ struct ImBuf *BKE_sequencer_cache_get(SeqRenderData context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type); diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 54ddb33e1ae..c098056eb5e 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -116,7 +116,7 @@ void free_blender(void) BLI_callback_global_finalize(); - BKE_sequencer_stripelem_cache_destruct(); + BKE_sequencer_cache_destruct(); IMB_moviecache_destruct(); free_nodesystem(); diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index 7133ed018e3..4f2eaba82a5 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -156,13 +156,13 @@ static int seqcache_hashcmp(const void *a_, const void *b_) return seq_cmp_render_data(&a->context, &b->context); } -void BKE_sequencer_stripelem_cache_destruct(void) +void BKE_sequencer_cache_destruct(void) { if (moviecache) IMB_moviecache_free(moviecache); } -void BKE_sequencer_stripelem_cache_cleanup(void) +void BKE_sequencer_cache_cleanup(void) { if (moviecache) { IMB_moviecache_free(moviecache); @@ -172,7 +172,6 @@ void BKE_sequencer_stripelem_cache_cleanup(void) struct ImBuf *BKE_sequencer_cache_get(SeqRenderData context, Sequence *seq, float cfra, seq_stripelem_ibuf_t type) { - if (moviecache && seq) { SeqCacheKey key; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 137c0180fb4..d5a766ef97e 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2739,7 +2739,7 @@ void BKE_sequencer_free_imbuf(Scene *scene, ListBase *seqbase, int check_mem_usa } } - BKE_sequencer_stripelem_cache_cleanup(); + BKE_sequencer_cache_cleanup(); for (seq = seqbase->first; seq; seq = seq->next) { if (seq->strip) { diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 0421439aa00..6eaef62ec40 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -224,7 +224,7 @@ static int screen_render_exec(bContext *C, wmOperator *op) * otherwise, invalidated cache entries can make their way into * the output rendering. We can't put that into RE_BlenderFrame, * since sequence rendering can call that recursively... (peter) */ - BKE_sequencer_stripelem_cache_cleanup(); + BKE_sequencer_cache_cleanup(); RE_SetReports(re, op->reports); @@ -526,7 +526,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) * otherwise, invalidated cache entries can make their way into * the output rendering. We can't put that into RE_BlenderFrame, * since sequence rendering can call that recursively... (peter) */ - BKE_sequencer_stripelem_cache_cleanup(); + BKE_sequencer_cache_cleanup(); /* get editmode results */ ED_object_exit_editmode(C, 0); /* 0 = does not exit editmode */ -- cgit v1.2.3