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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-02-10 21:05:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-10 21:05:52 +0300
commit226fb2b37720c747dd8c4cd438d845439ed29edc (patch)
tree96235fa7b23140a57500da169c321f3a3cb4708e /source
parent2fe216b7068273716a758a65055949b5d8835c06 (diff)
revert previous commit, this should fix without disabling cases that worked before.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 282b8914aee..c27d6788300 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2501,16 +2501,15 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
int early_out = sh.early_out(seq, facf, facf);
- /* if any of these are the case blender would crash */
- if(se1->ibuf==NULL || se1->ibuf_comp==NULL || se2->ibuf==NULL || se2->ibuf_comp==NULL)
- continue;
-
switch (early_out) {
case 0: {
int x= se2->ibuf->x;
int y= se2->ibuf->y;
int swap_input = FALSE;
+ if(se1->ibuf_comp == NULL)
+ continue;
+
if (se1->ibuf_comp->rect_float ||
se2->ibuf->rect_float) {
se2->ibuf_comp = IMB_allocImBuf(
@@ -2573,7 +2572,8 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
}
case 1: {
se2->ibuf_comp = se1->ibuf;
- IMB_refImBuf(se2->ibuf_comp);
+ if(se2->ibuf_comp)
+ IMB_refImBuf(se2->ibuf_comp);
break;
}