diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 13:32:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 13:32:20 +0300 |
| commit | f30086b5b66b1f8f797a61d3506f97eda557d76a (patch) | |
| tree | 1a0a3eb3213bb627b72816fea91bc1b3ff082a98 /source/blender/editors/space_nla/nla_channels.c | |
| parent | f2b4a59be61e555a3813f1a31799f09affc5237e (diff) | |
| parent | ee49ee24c33b3bf905603322d35a60d59331a7f7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_nla/nla_channels.c')
| -rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index c1c9326b4ef..fc8c4b51635 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -129,7 +129,7 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, float x, int channe Object *ob = base->object; AnimData *adt = ob->adt; - if (nlaedit_is_tweakmode_on(ac) == 0) { + if (nlaedit_is_tweakmode_on(ac) == 0 && (base->flag & BASE_SELECTABLED)) { /* set selection status */ if (selectmode == SELECT_INVERT) { /* swap select */ |