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
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2010-11-28 21:23:21 +0300
committerPeter Schlaile <peter@schlaile.de>2010-11-28 21:23:21 +0300
commit510920a299478cdd50ce8ce4ff43d14eb4e2c2e4 (patch)
tree9b71b0e3e8c3ab5a746cc2f018c73541237c0893 /source/blender/blenkernel/intern
parent3f6eb67b7718e329a482d71d2340989ee0a15e76 (diff)
== Sequencer ==
This fixes Orig Dimension display (mostly). * orx, ory both didn't get calculated, if dimension already matched * putting them into Strip instead of StripData ment, that using images of different dimensions in one strip could lead to incorrect results Still TODO: on file open, timeline display happens before preview display which means: orig_width and height are calculated after the first draw of N-keys dialog. You have to hit refresh (or scrub one frame) to get the right values displayed.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index b98976729c4..9eafb3fb3e3 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1558,9 +1558,6 @@ static ImBuf * input_preprocess(
{
float mul;
- seq->strip->orx= ibuf->x;
- seq->strip->ory= ibuf->y;
-
if((seq->flag & SEQ_FILTERY) && seq->type != SEQ_MOVIE) {
IMB_filtery(ibuf);
}
@@ -2054,6 +2051,9 @@ static ImBuf * seq_render_strip(SeqRenderData context, Sequence * seq, float cfr
IMB_convert_profile(ibuf, IB_PROFILE_NONE);
copy_to_ibuf_still(context, seq, nr, ibuf);
+
+ s_elem->orig_width = ibuf->x;
+ s_elem->orig_height = ibuf->y;
}
break;
}
@@ -2073,7 +2073,10 @@ static ImBuf * seq_render_strip(SeqRenderData context, Sequence * seq, float cfr
/* we don't need both (speed reasons)! */
if (ibuf && ibuf->rect_float && ibuf->rect)
imb_freerectImBuf(ibuf);
-
+ if (ibuf) {
+ seq->strip->stripdata->orig_width = ibuf->x;
+ seq->strip->stripdata->orig_height = ibuf->y;
+ }
}
copy_to_ibuf_still(context, seq, nr, ibuf);
break;