svn merge ^/trunk/blender -r41998:42009

release/scripts/startup/bl_operators/clip.py

@@ -259,14 +259,10 @@ object's movement caused by this constraint"""
                 con = x
 
         if not con:
-            return
+            self.report({'ERROR'},
+                "Motion Tracking constraint to be converted not found")
 
-        if con.type == 'FOLLOW_TRACK' and con.use_3d_position:
-            mat = ob.matrix_world.copy()
-            ob.constraints.remove(con)
-            ob.matrix_world = mat
-
-            return
+            return {'CANCELLED'}
 
         # Get clip used for parenting
         if con.use_active_clip:
@@ -275,7 +271,17 @@ object's movement caused by this constraint"""
             clip = con.clip
 
         if not clip:
-            return
+            self.report({'ERROR'},
+                "Movie clip to use tracking data from isn't set")
+
+            return {'CANCELLED'}
+
+        if con.type == 'FOLLOW_TRACK' and con.use_3d_position:
+            mat = ob.matrix_world.copy()
+            ob.constraints.remove(con)
+            ob.matrix_world = mat
+
+            return {'FINISHED'}
 
         # Find start and end frames
         for track in clip.tracking.tracks:

release/scripts/startup/bl_ui/properties_data_modifier.py

@@ -458,12 +458,19 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         layout.separator()
 
         layout.prop(md, "use_normals")
-
-        row = layout.row()
-        row.prop(md, "use_foam")
-        sub = row.row()
+        
+        split = layout.split()
+        
+        col = split.column()
+        col.prop(md, "use_foam")
+        sub = col.row()
         sub.active = md.use_foam
         sub.prop(md, "foam_coverage", text="Coverage")
+        
+        col = split.column()
+        col.active = md.use_foam
+        col.label("Foam Data Layer Name:")
+        col.prop(md, "foam_layer_name", text="")
 
         layout.separator()