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:
authorPeter Schlaile <peter@schlaile.de>2009-04-23 10:07:51 +0400
committerPeter Schlaile <peter@schlaile.de>2009-04-23 10:07:51 +0400
commitad8e98bccd01ef7ae0e0499473a7032b105ebc70 (patch)
treec2e431afe7980d4ba9466c961d6134383198b303 /source
parent073abf70478965df98d0af61554d0e132dc5ade8 (diff)
== SEQUENCER ==
This fixes [#18079] Sequencer color correction does not apply on float image if "make float" is not applied and closes [#18582] bug fix #18079 by removing ibuf->rect on image load if ibuf->rect_float is used. (Don't know, why the OpenEXR loader does that, but I fix this on sequencer side for now...)
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/sequence.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c
index ca4cf4df614..d056f345249 100644
--- a/source/blender/src/sequence.c
+++ b/source/blender/src/sequence.c
@@ -1761,6 +1761,11 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra,
if (!se->ibuf) {
se->ibuf= IMB_loadiffname(
name, IB_rect);
+ /* we don't need both (speed reasons)! */
+ if (se->ibuf->rect_float && se->ibuf->rect) {
+ imb_freerectImBuf(se->ibuf);
+ }
+
copy_to_ibuf_still(seq, se);
}
@@ -1791,6 +1796,12 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra,
if(seq->anim) {
IMB_anim_set_preseek(seq->anim, seq->anim_preseek);
se->ibuf = IMB_anim_absolute(seq->anim, se->nr + seq->anim_startofs);
+ /* we don't need both (speed reasons)! */
+ if (se->ibuf->rect_float
+ && se->ibuf->rect) {
+ imb_freerectImBuf(se->ibuf);
+ }
+
}
copy_to_ibuf_still(seq, se);
}