diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
commit | e6e265b2b59e02cc7816a2ed43471eca8bca0a62 (patch) | |
tree | e312d2c2f6cb1aaf79148648e5725902ab23d34e /source/blender/blenkernel/intern/constraint.c | |
parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 3e14dbe39da..92304278b3f 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -3941,7 +3941,6 @@ static void followtrack_new_data (void *cdata) data->clip= NULL; data->flag|= FOLLOWTRACK_ACTIVECLIP; - data->reference= FOLLOWTRACK_TRACK; } static void followtrack_id_looper (bConstraint *con, ConstraintIDFunc func, void *userdata) @@ -3969,7 +3968,7 @@ static void followtrack_evaluate (bConstraint *con, bConstraintOb *cob, ListBase if(!track) return; - if(data->reference==FOLLOWTRACK_BUNDLE) { + if(data->flag&FOLLOWTRACK_USE_3D_POSITION) { if(track->flag&TRACK_HAS_BUNDLE) { float pos[3], mat[4][4], obmat[4][4]; |