diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:21:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:27:03 +0300 |
| commit | 941484ff81744ad2dca1741f3e9c4b4c18664a82 (patch) | |
| tree | 3d80e516e39a7d55be8439c2ce3e06943de0a3f6 /release | |
| parent | 0dd98af2559b89149f2b6ae586969c0544c26369 (diff) | |
| parent | 7fb393f9ba3866026c8fb2c5c5ef7e0906cfe8b4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/clip.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index ea68641f68b..d648ec83b7c 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -303,7 +303,7 @@ class CLIP_OT_bundles_to_mesh(Operator): mesh = bpy.data.meshes.new(name="Tracks") for track in tracking_object.tracks: - if track.has_bundle: + if track.has_bundle and track.select == True: new_verts.append(track.bundle) if new_verts: diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 1604c878595..d449dd20c3e 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2779,7 +2779,7 @@ class VIEW3D_MT_edit_mesh_normals(Menu): class VIEW3D_MT_edit_mesh_clean(Menu): - bl_label = "Clean up" + bl_label = "Clean Up" def draw(self, context): layout = self.layout @@ -2885,6 +2885,10 @@ def draw_curve(self, context): layout.separator() + layout.menu("VIEW3D_MT_edit_curve_clean") + + layout.separator() + layout.menu("VIEW3D_MT_edit_proportional") layout.separator() @@ -2933,6 +2937,14 @@ class VIEW3D_MT_edit_curve_segments(Menu): layout.operator("curve.subdivide") layout.operator("curve.switch_direction") +class VIEW3D_MT_edit_curve_clean(Menu): + bl_label = "Clean Up" + + def draw(self, context): + layout = self.layout + + layout.operator("curve.decimate") + class VIEW3D_MT_edit_curve_specials(Menu): bl_label = "Specials" @@ -3941,6 +3953,7 @@ classes = ( VIEW3D_MT_edit_curve, VIEW3D_MT_edit_curve_ctrlpoints, VIEW3D_MT_edit_curve_segments, + VIEW3D_MT_edit_curve_clean, VIEW3D_MT_edit_curve_specials, VIEW3D_MT_edit_curve_delete, VIEW3D_MT_edit_curve_showhide, |