diff options
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_mask_common.py | 9 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 30 | ||||
| -rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 1 |
3 files changed, 38 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index d38f5f934b4..9f72d7a6d88 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -190,16 +190,21 @@ class MASK_PT_point(): clip = parent.id tracking = clip.tracking + row = col.row() + row.prop(parent, "type", expand=True) + col.prop_search(parent, "parent", tracking, "objects", icon='OBJECT_DATA', text="Object:") + tracks_list = "tracks" if parent.type == 'POINT_TRACK' else 'plane_tracks' + if parent.parent in tracking.objects: object = tracking.objects[parent.parent] col.prop_search(parent, "sub_parent", object, - "tracks", icon='ANIM_DATA', text="Track:") + tracks_list, icon='ANIM_DATA', text="Track:") else: col.prop_search(parent, "sub_parent", tracking, - "tracks", icon='ANIM_DATA', text="Track:") + tracks_list, icon='ANIM_DATA', text="Track:") class MASK_PT_display(): diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 5048a93d565..04584855ed3 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -311,6 +311,16 @@ class CLIP_PT_tools_tracking(CLIP_PT_tracking_panel, Panel): layout.operator("clip.join_tracks", text="Join") +class CLIP_PT_tools_plane_tracking(CLIP_PT_tracking_panel, Panel): + bl_space_type = 'CLIP_EDITOR' + bl_region_type = 'TOOLS' + bl_label = "Plane Track" + + def draw(self, context): + layout = self.layout + layout.operator("clip.create_plane_track") + + class CLIP_PT_tools_solve(CLIP_PT_tracking_panel, Panel): bl_space_type = 'CLIP_EDITOR' bl_region_type = 'TOOLS' @@ -579,6 +589,26 @@ class CLIP_PT_track(CLIP_PT_tracking_panel, Panel): layout.label(text=label_text) +class CLIP_PT_plane_track(CLIP_PT_tracking_panel, Panel): + bl_space_type = 'CLIP_EDITOR' + bl_region_type = 'UI' + bl_label = "Plane Track" + + def draw(self, context): + layout = self.layout + + sc = context.space_data + clip = context.space_data.clip + active_track = clip.tracking.plane_tracks.active + + if not active_track: + layout.active = False + layout.label(text="No active plane track") + return + + layout.prop(active_track, "name") + + class CLIP_PT_track_settings(CLIP_PT_tracking_panel, Panel): bl_space_type = 'CLIP_EDITOR' bl_region_type = 'UI' diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 91090dc2c75..6a5dccaed88 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -342,6 +342,7 @@ compositor_node_categories = [ NodeItem("CompositorNodeMapUV"), NodeItem("CompositorNodeTransform"), NodeItem("CompositorNodeStabilize"), + NodeItem("CompositorNodePlaneTrackDeform"), ]), CompositorNodeCategory("CMP_GROUP", "Group", items=node_group_items), CompositorNodeCategory("CMP_LAYOUT", "Layout", items=[ |