diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-02-10 00:22:24 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-02-10 00:22:24 +0300 |
| commit | 59a508d00b60cee1573d0158c52a83e1b4e6f74b (patch) | |
| tree | 63814d957f743a7000c47222256341087ac3e1df /source/blender/editors/include/ED_anim_api.h | |
| parent | d2e41b38df1130049b649406c6bfdcdf2482c783 (diff) | |
Bugfix #20903: Concitency issues between point and click and Tab Key in the Graph Editor
- 'Toggle' operators for channel settings now now act more like the select-all type of "toggle" operator. The old behaviour has now been moved to "invert".
- Channel settings are now flushed (like for visibility and when clicking) for muting and locking when using the operators
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index f8d2e9610c9..59a0442c762 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -311,9 +311,10 @@ short ANIM_animdata_context_getdata(bAnimContext *ac); /* flag-setting behaviour */ typedef enum eAnimChannels_SetFlag { - ACHANNEL_SETFLAG_CLEAR = 0, - ACHANNEL_SETFLAG_ADD, - ACHANNEL_SETFLAG_TOGGLE + ACHANNEL_SETFLAG_CLEAR = 0, /* turn off */ + ACHANNEL_SETFLAG_ADD, /* turn on */ + ACHANNEL_SETFLAG_INVERT, /* on->off, off->on */ + ACHANNEL_SETFLAG_TOGGLE, /* some on -> all off // all on */ } eAnimChannels_SetFlag; /* types of settings for AnimChannels */ @@ -504,24 +505,24 @@ void ANIM_unit_mapping_apply_fcurve(struct Scene *scene, struct ID *id, struct F /* set/clear/toggle macro * - channel - channel with a 'flag' member that we're setting - * - smode - 0=clear, 1=set, 2=toggle + * - smode - 0=clear, 1=set, 2=invert * - sflag - bitflag to set */ #define ACHANNEL_SET_FLAG(channel, smode, sflag) \ { \ - if (smode == ACHANNEL_SETFLAG_TOGGLE) (channel)->flag ^= (sflag); \ + if (smode == ACHANNEL_SETFLAG_INVERT) (channel)->flag ^= (sflag); \ else if (smode == ACHANNEL_SETFLAG_ADD) (channel)->flag |= (sflag); \ else (channel)->flag &= ~(sflag); \ } /* set/clear/toggle macro, where the flag is negative * - channel - channel with a 'flag' member that we're setting - * - smode - 0=clear, 1=set, 2=toggle + * - smode - 0=clear, 1=set, 2=invert * - sflag - bitflag to set */ #define ACHANNEL_SET_FLAG_NEG(channel, smode, sflag) \ { \ - if (smode == ACHANNEL_SETFLAG_TOGGLE) (channel)->flag ^= (sflag); \ + if (smode == ACHANNEL_SETFLAG_INVERT) (channel)->flag ^= (sflag); \ else if (smode == ACHANNEL_SETFLAG_ADD) (channel)->flag &= ~(sflag); \ else (channel)->flag |= (sflag); \ } |