archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for changes in recent renaming

Browse Source
This commit is contained in:
Campbell Barton
2010-08-22 05:45:04 +00:00
parent 4fe2c63e6d
commit c2036fda5d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/ui/space_view3d.py
View File

@@ -2167,7 +2167,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
if (bg.image): if (bg.image):
box.template_image(bg, "image", bg.image_user, compact=True) box.template_image(bg, "image", bg.image_user, compact=True)
box.prop(bg, "use_transparency", slider=True) box.prop(bg, "transparency", slider=True)
if bg.view_axis != 'CAMERA': if bg.view_axis != 'CAMERA':
box.prop(bg, "size") box.prop(bg, "size")
row = box.row(align=True) row = box.row(align=True)

4
source/blender/editors/space_image/image_buttons.c
View File

@@ -897,7 +897,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
sprintf(str, "(%d) Frames", iuser->framenr); sprintf(str, "(%d) Frames", iuser->framenr);
row= uiLayoutRow(col, 1); row= uiLayoutRow(col, 1);
uiItemR(col, userptr, "frames", 0, str, 0); uiItemR(col, userptr, "frame_duration", 0, str, 0);
if(ima->anim) { if(ima->anim) {
block= uiLayoutGetBlock(row); block= uiLayoutGetBlock(row);
but= uiDefBut(block, BUT, 0, "Match Movie Length", 0, 0, UI_UNIT_X*2, UI_UNIT_Y, 0, 0, 0, 0, 0, "Set the number of frames to match the movie or sequence."); but= uiDefBut(block, BUT, 0, "Match Movie Length", 0, 0, UI_UNIT_X*2, UI_UNIT_Y, 0, 0, 0, 0, 0, "Set the number of frames to match the movie or sequence.");
@@ -905,7 +905,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
} }
uiItemR(col, userptr, "frame_start", 0, "Start", 0); uiItemR(col, userptr, "frame_start", 0, "Start", 0);
uiItemR(col, userptr, "offset", 0, NULL, 0); uiItemR(col, userptr, "frame_offset", 0, NULL, 0);
col= uiLayoutColumn(split, 0); col= uiLayoutColumn(split, 0);
uiItemR(col, userptr, "fields_per_frame", 0, "Fields", 0); uiItemR(col, userptr, "fields_per_frame", 0, "Fields", 0);