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 /release
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 'release')
-rw-r--r--release/scripts/ui/space_sequencer.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py
index 5f283491491..c709483a08b 100644
--- a/release/scripts/ui/space_sequencer.py
+++ b/release/scripts/ui/space_sequencer.py
@@ -384,8 +384,16 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, bpy.types.Panel):
col.label(text="Frame Offset %d:%d" % (strip.frame_offset_start, strip.frame_offset_end))
col.label(text="Frame Still %d:%d" % (strip.frame_still_start, strip.frame_still_end))
- if strip.type in ('MOVIE', 'IMAGE'):
- col.label(text="Orig Dim: %dx%d" % (strip.orig_width, strip.orig_height))
+
+ elem = False
+
+ if strip.type == 'IMAGE':
+ elem = strip.getStripElem(frame_current)
+ elif strip.type == 'MOVIE':
+ elem = strip.elements[0]
+
+ if elem and elem.orig_width > 0 and elem.orig_height > 0:
+ col.label(text="Orig Dim: %dx%d" % (elem.orig_width, elem.orig_height))
class SEQUENCER_PT_effect(SequencerButtonsPanel, bpy.types.Panel):