diff options
author | Joshua Leung <aligorith@gmail.com> | 2016-02-26 05:34:32 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2016-02-26 09:12:44 +0300 |
commit | 1db29781dbb9ad3f972f27a74a60aa244a6e86cd (patch) | |
tree | 2d212f6eecccb6f3a80e9c956776979932adece7 | |
parent | 18a6ebbc3a46ba3e2f4608de6e91b36a88873670 (diff) |
Fix T47503 - My previous fix for T47472 accidentally reused an unrelated flag
ked->iterflags actually already had an enum defined, but at the time of the previous
fix, I'd forgotten that it was defined. As a result, "f1 needs NLA remap" got given
the same flag as "include handles when doing keyframe selection checks".
-rw-r--r-- | source/blender/editors/include/ED_keyframes_edit.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 7528594ecdf..52e5cd28625 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -131,21 +131,10 @@ typedef struct KeyframeEditData { int curIndex; /* index of current keyframe being iterated over */ /* flags */ - short curflags; /* current flags for the keyframe we're reached in the iteration process */ - short iterflags; /* settings for iteration process */ + short curflags; /* current flags for the keyframe we're reached in the iteration process (eKeyframeVertOk) */ + short iterflags; /* settings for iteration process (eKeyframeIterFlags) */ } KeyframeEditData; -/* Flags for controlling the iteration process (to supply additional capabilities, etc.) */ -typedef enum eKeyframeEditData_IterFlags { - /* Perform NLA time remapping (global -> strip) for the "f1" parameter - * (e.g. used for selection tools on summary tracks) - */ - KED_F1_NLA_UNMAP = (1 << 0), - - /* Perform NLA time remapping (global -> strip) for the "f2" parameter */ - KED_F2_NLA_UNMAP = (1 << 1), -} eKeyframeEditData_IterFlags; - /* ------- Function Pointer Typedefs ---------------- */ /* callback function that refreshes the F-Curve after use */ @@ -171,7 +160,15 @@ typedef enum eKeyframeVertOk { typedef enum eKeyframeIterFlags { /* consider handles in addition to key itself */ KEYFRAME_ITER_INCL_HANDLES = (1 << 0), -} eKeyframeIterFlags; + + /* Perform NLA time remapping (global -> strip) for the "f1" parameter + * (e.g. used for selection tools on summary tracks) + */ + KED_F1_NLA_UNMAP = (1 << 1), + + /* Perform NLA time remapping (global -> strip) for the "f2" parameter */ + KED_F2_NLA_UNMAP = (1 << 2), +} eKeyframeIterFlags; /* ------- Custom Data Type Defines ------------------ */ |