[Bf-blender-cvs] [953559a] master: Code cleanup: avoid call to BLI_countlist

Campbell Barton noreply at git.blender.org
Fri Jun 13 16:47:48 CEST 2014


Commit: 953559a7945f3bd36e49fba2b9512b396c3863aa
Author: Campbell Barton
Date:   Thu May 29 02:22:04 2014 +1000
https://developer.blender.org/rB953559a7945f3bd36e49fba2b9512b396c3863aa

Code cleanup: avoid call to BLI_countlist

===================================================================

M	source/blender/blenkernel/intern/sequencer.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index a1cd6b8..4118be6 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3075,13 +3075,12 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context, ListBase *seq
 ImBuf *BKE_sequencer_give_ibuf(const SeqRenderData *context, float cfra, int chanshown)
 {
 	Editing *ed = BKE_sequencer_editing_get(context->scene, false);
-	int count;
 	ListBase *seqbasep;
 	
 	if (ed == NULL) return NULL;
 
-	count = BLI_countlist(&ed->metastack);
-	if ((chanshown < 0) && (count > 0)) {
+	if ((chanshown < 0) && !BLI_listbase_is_empty(&ed->metastack)) {
+		int count = BLI_countlist(&ed->metastack);
 		count = max_ii(count + chanshown, 0);
 		seqbasep = ((MetaStack *)BLI_findlink(&ed->metastack, count))->oldbasep;
 	}




More information about the Bf-blender-cvs mailing list