svn merge ^/trunk/blender -r43092:43092

This commit is contained in:
2012-01-04 06:20:10 +00:00
15 changed files with 126 additions and 287 deletions

View File

@@ -774,7 +774,7 @@ class ConstraintButtonsPanel():
if clip:
layout.prop_search(con, "object", clip.tracking, "objects", icon='OBJECT_DATA')
layout.prop_search(con, "track", clip.tracking, "tracks", icon='ANIMATION_DATA')
layout.prop_search(con, "track", clip.tracking, "tracks", icon='ANIM_DATA')
layout.prop(con, "camera")