Merge branch 'master' into blender2.8

1 files changed, 8 insertions, 7 deletions

diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index 467512a9746..f13c1fb3130 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -301,20 +301,21 @@ class CLIP_OT_bundles_to_mesh(Operator):
             reconstructed_matrix = reconstruction.cameras.matrix_from_frame(framenr)
             matrix = camera.matrix_world * reconstructed_matrix.inverted()
 
-        mesh = bpy.data.meshes.new(name="Tracks")
         for track in tracking_object.tracks:
             if track.has_bundle and track.select == True:
                 new_verts.append(track.bundle)
 
         if new_verts:
+            mesh = bpy.data.meshes.new(name="Tracks")
             mesh.vertices.add(len(new_verts))
             mesh.vertices.foreach_set("co", unpack_list(new_verts))
-
-        ob = bpy.data.objects.new(name="Tracks", object_data=mesh)
-
-        ob.matrix_world = matrix
-
-        context.scene.objects.link(ob)
+            ob = bpy.data.objects.new(name="Tracks", object_data=mesh)
+            ob.matrix_world = matrix
+            context.scene.objects.link(ob)
+            ob.select = True
+            context.scene.objects.active = ob
+        else:
+            self.report({'WARNING'}, "No usable tracks selected")
 
         return {'FINISHED'}