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

Mask editing: remove use_parent property and use check if paren't id is set instead

Browse Source
This commit is contained in:
Sergey Sharybin
2012-06-08 07:54:46 +00:00
parent b0c868c3b3
commit fc07b1fce3
6 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
release/scripts/startup/bl_ui/space_clip.py
View File

@@ -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):