diff options
author | Joshua Leung <aligorith@gmail.com> | 2010-02-03 12:05:31 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2010-02-03 12:05:31 +0300 |
commit | 53596fc6b8f47d9dec633b1ea5ae56a893d0cf3f (patch) | |
tree | 535776eddcc74e9a221b89f572fdb929820d2bf8 /source/blender/makesdna/DNA_constraint_types.h | |
parent | 742ef3b4cc5dabb337e6afe20d6f016106c8bc10 (diff) |
Bugfix #20940: Offset always resets to 1 in follow path constraint
Made the 'Offset Factor' setting use a separate variable from the 'Offset' setting in the DNA stuff. While we could get away with this sort of thing in the past, it turns out that with the Datablocks viewer these days, settings sharing an internal var but with different ranges/behaviour doesn't work well anymore, since later instances override earlier ones.
Diffstat (limited to 'source/blender/makesdna/DNA_constraint_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_constraint_types.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 163933da12a..09b25f9b453 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -257,11 +257,15 @@ typedef struct bDampTrackConstraint { /* Follow Path constraints */ typedef struct bFollowPathConstraint { - Object *tar; /* Must be path object */ - float offset; /* Offset in time on the path (in frame) */ + Object *tar; /* Must be path object */ + + float offset; /* Offset in time on the path (in frames), when NOT using 'fixed position' */ + float offset_fac; /* Parametric offset factor defining position along path, when using 'fixed position' */ + int followflag; - int trackflag; - int upflag; + + short trackflag; + short upflag; } bFollowPathConstraint; /* Stretch to constraint */ |