archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

This fixes

Browse Source 
[#25011] Opacity IPO not refreshing with still images

(should be better named: animation of any prefiltering parameters using 
still images didn't work out as expected)

And this issue by private mail by Ton:

"I tried to debug a memory-free error; very simple case:

- add image strip
- click on strip at 2 places
- quit blender"
This commit is contained in:
Peter Schlaile
2010-12-17 08:08:35 +00:00
parent 5b56bbfa0b
commit 9f3edfecfc
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenkernel/intern/sequencer.c
View File

@@ -1683,8 +1683,7 @@ static ImBuf * copy_from_ibuf_still(SeqRenderData context, Sequence * seq,
ibuf = seq_stripelem_cache_get(
context, seq, seq->start,
SEQ_STRIPELEM_IBUF_STARTSTILL);
}
if (nr == seq->len - 1) {
} else if (nr == seq->len - 1) {
ibuf = seq_stripelem_cache_get(
context, seq, seq->start,
SEQ_STRIPELEM_IBUF_ENDSTILL);
@@ -1705,7 +1704,8 @@ static void copy_to_ibuf_still(SeqRenderData context, Sequence * seq, float nr,
seq_stripelem_cache_put(
context, seq, seq->start,
SEQ_STRIPELEM_IBUF_STARTSTILL, ibuf);
}
}
if (nr == seq->len - 1) {
seq_stripelem_cache_put(
context, seq, seq->start,
@@ -1969,13 +1969,14 @@ static ImBuf * seq_render_strip(SeqRenderData context, Sequence * seq, float cfr
ibuf = seq_stripelem_cache_get(context, seq, cfra, SEQ_STRIPELEM_IBUF);
if (ibuf == NULL)
ibuf = copy_from_ibuf_still(context, seq, nr);
/* currently, we cache preprocessed images */
/* currently, we cache preprocessed images in SEQ_STRIPELEM_IBUF,
but not(!) on SEQ_STRIPELEM_IBUF_ENDSTILL and ..._STARTSTILL */
if (ibuf)
use_preprocess = FALSE;
if (ibuf == NULL)
ibuf = copy_from_ibuf_still(context, seq, nr);
if (ibuf == NULL)
ibuf = seq_proxy_fetch(context, seq, cfra);