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:
authorCampbell Barton <ideasman42@gmail.com>2010-07-14 02:21:59 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-07-14 02:21:59 +0400
commit03e638d1285b2a26902230772ae9261406fd6658 (patch)
tree44334ffbbe2cc7917c14fa24c244652e88f2a5f5 /release
parentc5d6665cb3965cde556e58b182070a41a3956732 (diff)
- make duplis real wasnt redrawing
- small caps option for titles (doing manually is quite painful to watch).
Diffstat (limited to 'release')
-rw-r--r--release/scripts/ui/properties_data_curve.py12
-rw-r--r--release/scripts/ui/space_sequencer.py2
2 files changed, 9 insertions, 5 deletions
diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/ui/properties_data_curve.py
index 8ab0243ed3e..8c02754ecac 100644
--- a/release/scripts/ui/properties_data_curve.py
+++ b/release/scripts/ui/properties_data_curve.py
@@ -308,10 +308,13 @@ class DATA_PT_font(DataButtonsPanel):
split = layout.split()
- col = split.column(align=True)
- col.label(text="Underline:")
- col.prop(text, "ul_position", text="Position")
- col.prop(text, "ul_height", text="Thickness")
+ col = split.column()
+ colsub = col.column(align=True)
+ colsub.label(text="Underline:")
+ colsub.prop(text, "ul_position", text="Position")
+ colsub.prop(text, "ul_height", text="Thickness")
+ col.label(text="")
+ col.prop(text, "small_caps_scale", text="Small Caps")
if wide_ui:
col = split.column()
@@ -319,6 +322,7 @@ class DATA_PT_font(DataButtonsPanel):
col.prop(char, "bold")
col.prop(char, "italic")
col.prop(char, "underline")
+ col.prop(char, "use_small_caps")
# col.prop(char, "style")
# col.prop(char, "wrap")
diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py
index a41b5fe5262..97d84b77e18 100644
--- a/release/scripts/ui/space_sequencer.py
+++ b/release/scripts/ui/space_sequencer.py
@@ -373,7 +373,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel):
row.label(text="Final Length: %s" % bpy.utils.smpte_from_frame(strip.frame_final_length))
row = col.row()
row.active = (frame_current >= strip.frame_start and frame_current <= strip.frame_start + strip.frame_length)
- row.label(text="Strip Position: %d" % (frame_current - strip.frame_start))
+ row.label(text="Playhead: %d" % (frame_current - strip.frame_start))
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))