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>2009-08-28 19:03:49 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-08-28 19:03:49 +0400
commit9e7b276dba2493fe1597fbdb0d906d1bab776fe9 (patch)
tree83745184e0c6ed4e52500c77c66398f62d8aac14 /release
parent9ea58be54ef62f79017678c20e04590bb5cbdaa1 (diff)
Sequence sound was raising a python exception with crop and offset buttons.
renamed RNA properties. x_offset, y_offset -> offset_x, offset_y, this order is more common in rna. render.border -> render.use_border render.placeholders -> render.use_placeholder render.no_overwrite -> render.use_overwrite
Diffstat (limited to 'release')
-rw-r--r--release/ui/buttons_data_text.py4
-rw-r--r--release/ui/buttons_scene.py8
-rw-r--r--release/ui/space_sequencer.py39
-rw-r--r--release/ui/space_view3d.py4
4 files changed, 28 insertions, 27 deletions
diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index 62d4d0a4d21..1abc82cfaa3 100644
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -134,8 +134,8 @@ class DATA_PT_paragraph(DataButtonsPanel):
col = split.column(align=True)
col.itemL(text="Offset:")
- col.itemR(text, "x_offset", text="X")
- col.itemR(text, "y_offset", text="Y")
+ col.itemR(text, "offset_x", text="X")
+ col.itemR(text, "offset_y", text="Y")
#col.itemR(text, "wrap")
"""
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index 08eee7ef43a..abd42e32e35 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -222,8 +222,8 @@ class SCENE_PT_output(RenderButtonsPanel):
col = split.column()
col.itemR(rd, "file_extensions")
- col.itemR(rd, "placeholders")
- col.itemR(rd, "no_overwrite")
+ col.itemR(rd, "use_overwrite")
+ col.itemR(rd, "use_placeholder")
if rd.file_format in ('AVIJPEG', 'JPEG'):
split = layout.split()
@@ -370,9 +370,9 @@ class SCENE_PT_dimensions(RenderButtonsPanel):
sub.itemR(rd, "pixel_aspect_y", text="Y")
row = col.row()
- row.itemR(rd, "border", text="Border")
+ row.itemR(rd, "use_border", text="Border")
rowsub = row.row()
- rowsub.active = rd.border
+ rowsub.active = rd.use_border
rowsub.itemR(rd, "crop_to_border", text="Crop")
col = split.column(align=True)
diff --git a/release/ui/space_sequencer.py b/release/ui/space_sequencer.py
index de3cfa17987..cf9d89edec8 100644
--- a/release/ui/space_sequencer.py
+++ b/release/ui/space_sequencer.py
@@ -434,26 +434,27 @@ class SEQUENCER_PT_input(SequencerButtonsPanel):
if elem:
col.itemR(elem, "filename", text="") # strip.elements[0] could be a fallback
- layout.itemR(strip, "use_translation", text="Image Offset:")
- if strip.transform:
- col = layout.column(align=True)
- col.active = strip.use_translation
- col.itemR(strip.transform, "offset_x", text="X")
- col.itemR(strip.transform, "offset_y", text="Y")
-
- layout.itemR(strip, "use_crop", text="Image Crop:")
- if strip.crop:
+ if strip.type != 'SOUND':
+ layout.itemR(strip, "use_translation", text="Image Offset:")
+ if strip.transform:
+ col = layout.column(align=True)
+ col.active = strip.use_translation
+ col.itemR(strip.transform, "offset_x", text="X")
+ col.itemR(strip.transform, "offset_y", text="Y")
+
+ layout.itemR(strip, "use_crop", text="Image Crop:")
+ if strip.crop:
+ col = layout.column(align=True)
+ col.active = strip.use_crop
+ col.itemR(strip.crop, "top")
+ col.itemR(strip.crop, "left")
+ col.itemR(strip.crop, "bottom")
+ col.itemR(strip.crop, "right")
+
col = layout.column(align=True)
- col.active = strip.use_crop
- col.itemR(strip.crop, "top")
- col.itemR(strip.crop, "left")
- col.itemR(strip.crop, "bottom")
- col.itemR(strip.crop, "right")
-
- col = layout.column(align=True)
- col.itemL(text="Trim Duration:")
- col.itemR(strip, "animation_start_offset", text="Start")
- col.itemR(strip, "animation_end_offset", text="End")
+ col.itemL(text="Trim Duration:")
+ col.itemR(strip, "animation_start_offset", text="Start")
+ col.itemR(strip, "animation_end_offset", text="End")
class SEQUENCER_PT_sound(SequencerButtonsPanel):
__label__ = "Sound"
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index ae17307080f..5801f9e7941 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -1244,8 +1244,8 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
col.itemL(text="Offset:")
col = layout.column(align=True)
- col.itemR(bg, "x_offset", text="X")
- col.itemR(bg, "y_offset", text="Y")
+ col.itemR(bg, "offset_x", text="X")
+ col.itemR(bg, "offset_y", text="Y")
bpy.types.register(VIEW3D_HT_header) # Header