diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-04 13:19:39 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-04 13:19:39 +0400 |
commit | 388da558edd63a8a5d5d3025efd520cb97b9616a (patch) | |
tree | 2f8ad1f5260898ae8b4ff5b93411b2f274eb7522 /source/blender/makesrna/intern/rna_tracking.c | |
parent | 76b8b67565113d3f68cd5ba1f546c2bd4d2aa583 (diff) |
Camera tracking: fixes in Link Empty to Track and Bundles to Mesh operators
- This operators always used to work with tracks for camera
- Properly set camera and object fields to Follow Track constraint
- TrackingObject.tracks is now pointing to actual list of tracks for
camera objects.
Diffstat (limited to 'source/blender/makesrna/intern/rna_tracking.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index bbec6484c5f..c29d655feb2 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -305,7 +305,14 @@ static void rna_trackingObject_tracks_begin(CollectionPropertyIterator *iter, Po { MovieTrackingObject *object= (MovieTrackingObject* )ptr->data; - rna_iterator_listbase_begin(iter, &object->tracks, NULL); + if(object->flag&TRACKING_OBJECT_CAMERA) { + MovieClip *clip= (MovieClip*)ptr->id.data; + + rna_iterator_listbase_begin(iter, &clip->tracking.tracks, NULL); + } + else { + rna_iterator_listbase_begin(iter, &object->tracks, NULL); + } } static PointerRNA rna_tracking_active_object_get(PointerRNA *ptr) |