sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

== Sequencer ==

Browse Source 
Added some additional NULL-checks. (se->ibuf can be null, shame on me :)
This commit is contained in:
Peter Schlaile 2008-01-01 18:38:41 +00:00
parent 9db2035e36
commit fb3ed9e0a5
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/src/sequence.c
View File

@ -1465,8 +1465,10 @@ static TStripElem* do_build_seq_array_recursively(
if(count == 1) { if(count == 1) {
se = do_build_seq_recursively(seq_arr[0], cfra); se = do_build_seq_recursively(seq_arr[0], cfra);
se->ibuf_comp = se->ibuf; if (se->ibuf) {
IMB_refImBuf(se->ibuf_comp); se->ibuf_comp = se->ibuf;
IMB_refImBuf(se->ibuf_comp);
}
return se; return se;
} }
@ -1485,8 +1487,14 @@ static TStripElem* do_build_seq_array_recursively(
} }
if (seq->blend_mode == SEQ_BLEND_REPLACE) { if (seq->blend_mode == SEQ_BLEND_REPLACE) {
do_build_seq_recursively(seq, cfra); do_build_seq_recursively(seq, cfra);
se->ibuf_comp = se->ibuf; if (se->ibuf) {
IMB_refImBuf(se->ibuf); se->ibuf_comp = se->ibuf;
IMB_refImBuf(se->ibuf);
} else {
se->ibuf_comp = IMB_allocImBuf(
(short)seqrectx, (short)seqrecty,
32, IB_rect, 0);
}
break; break;
} }
@ -1509,8 +1517,14 @@ static TStripElem* do_build_seq_array_recursively(
case -1: case -1:
case 2: case 2:
do_build_seq_recursively(seq, cfra); do_build_seq_recursively(seq, cfra);
se->ibuf_comp = se->ibuf; if (se->ibuf) {
IMB_refImBuf(se->ibuf_comp); se->ibuf_comp = se->ibuf;
IMB_refImBuf(se->ibuf_comp);
} else {
se->ibuf_comp = IMB_allocImBuf(
(short)seqrectx, (short)seqrecty,
32, IB_rect, 0);
}
break; break;
case 1: case 1:
if (i == 0) { if (i == 0) {
@ -1524,6 +1538,11 @@ static TStripElem* do_build_seq_array_recursively(
break; break;
case 0: case 0:
do_build_seq_recursively(seq, cfra); do_build_seq_recursively(seq, cfra);
if (!se->ibuf) {
se->ibuf = IMB_allocImBuf(
(short)seqrectx, (short)seqrecty,
32, IB_rect, 0);
}
break; break;
} }