diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-28 15:59:50 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-28 16:03:24 +0300 |
commit | 533e267e95cf1115eebde95a67dc3b05d48e6ffd (patch) | |
tree | 8ac4243c1042fa9e3678e4ae17e053a4c3b70101 /source/blender/makesdna/DNA_constraint_types.h | |
parent | f5e0ae655e5182de3ee9cfedfbdc2a20f9b047fb (diff) |
Remove Sticky option from the Floor constraint
This option from the very beginning of its existence needed more work
to make it work correct and this was never done.
This option was working fine during continuous playback, when there
are no skipped frames, but it was failing when AV-sync of framedrop
was enabled.
It was never working correct when jumping between frames, including
rendering on a farm which usually does frame-range based rendering.
With copy-on-write things became even more tricky, since the "stuck"
flag was never preserved between re-evaluations.
Fixes T65683: Sticky Option in Floor Constraint for Bones Not Working
Diffstat (limited to 'source/blender/makesdna/DNA_constraint_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_constraint_types.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 396030445f3..b613c661f29 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -315,12 +315,9 @@ typedef struct bMinMaxConstraint { int minmaxflag; float offset; int flag; - /** For backward compatibility. */ - short sticky, stuck; - char _pad[4]; - float cache[3]; /** MAX_ID_NAME-2. */ char subtarget[64]; + int _pad; } bMinMaxConstraint; /* Action Constraint */ @@ -945,8 +942,8 @@ typedef enum eArmature_Flags { /* MinMax (floor) flags */ typedef enum eFloor_Flags { - MINMAX_STICKY = (1 << 0), - MINMAX_STUCK = (1 << 1), + /* MINMAX_STICKY = (1 << 0), */ /* Deprecated. */ + /* MINMAX_STUCK = (1 << 1), */ /* Deprecated. */ MINMAX_USEROT = (1 << 2), } eFloor_Flags; |