diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-08 11:54:46 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-08 11:54:46 +0400 |
commit | fc07b1fce3a6f1d6962840859c763bd192fbdcd7 (patch) | |
tree | 852e55e25e36e1d46584ebd8b57531193eb24bfa /release | |
parent | b0c868c3b38663817678ae198ad84e7369d7957c (diff) |
Mask editing: remove use_parent property and use check if paren't id is set instead
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 4bec1ad18ba..c87c506d326 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -716,28 +716,27 @@ class CLIP_PT_active_mask_point(Panel): col.prop(point, "handle_type") col = layout.column() - col.prop(parent, "use_parent", text="Parent") - if parent.use_parent: - # Currently only parenting yo movie clip is allowed, so do not - # ver-oplicate things for now and use single template_ID - #col.template_any_ID(parent, "id", "id_type", text="") + # Currently only parenting yo movie clip is allowed, so do not + # ver-oplicate things for now and use single template_ID + #col.template_any_ID(parent, "id", "id_type", text="") - col.template_ID(parent, "id") + col.label("Parent:") + col.prop(parent, "id", text="") - if parent.id_type == 'MOVIECLIP' and parent.id: - clip = parent.id - tracking = clip.tracking + if parent.id_type == 'MOVIECLIP' and parent.id: + clip = parent.id + tracking = clip.tracking - col.prop_search(parent, "parent", tracking, - "objects", icon='OBJECT_DATA', text="Object:") + col.prop_search(parent, "parent", tracking, + "objects", icon='OBJECT_DATA', text="Object:") - if parent.parent and parent.parent in tracking.objects: - object = tracking.objects[parent.parent] - col.prop_search(parent, "sub_parent", object, - "tracks", icon='ANIM_DATA', text="Track:") - else: - col.prop_search(parent, "sub_parent", tracking, - "tracks", icon='ANIM_DATA', text="Track:") + if parent.parent in tracking.objects: + object = tracking.objects[parent.parent] + col.prop_search(parent, "sub_parent", object, + "tracks", icon='ANIM_DATA', text="Track:") + else: + col.prop_search(parent, "sub_parent", tracking, + "tracks", icon='ANIM_DATA', text="Track:") class CLIP_PT_display(CLIP_PT_clip_view_panel, Panel): |