diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-11-08 03:09:31 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-11-08 03:09:31 +0300 |
| commit | 615a2060c905196817dcf5020cc078418a955614 (patch) | |
| tree | 4a2e736475551ca272d8628fd1fd151d943e5dde /source/blender/editors | |
| parent | 55923d1044e43524310dc0192215bd1d81f3d966 (diff) | |
Bugfix: NLA Channel Borderselect works again
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 6b39565f6f0..3fe867fa3af 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -1688,6 +1688,16 @@ static void borderselect_anim_channels (bAnimContext *ac, rcti *rect, short sele agrp->flag &= ~AGRP_ACTIVE; } break; + case ANIMTYPE_NLATRACK: + { + NlaTrack *nlt= (NlaTrack *)ale->data; + + /* for now, it's easier just to do this here manually, as defining a new type + * currently adds complications when doing other stuff + */ + ACHANNEL_SET_FLAG(nlt, selectmode, NLATRACK_SELECTED); + } + break; } } diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 5fb7fa41752..40478ddcbc2 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -330,7 +330,7 @@ typedef enum eAnimChannels_SetFlag { /* types of settings for AnimChannels */ typedef enum eAnimChannel_Settings { - ACHANNEL_SETTING_SELECT = 0, + ACHANNEL_SETTING_SELECT = 0, ACHANNEL_SETTING_PROTECT, // warning: for drawing UI's, need to check if this is off (maybe inverse this later) ACHANNEL_SETTING_MUTE, ACHANNEL_SETTING_EXPAND, |