From ee49ee24c33b3bf905603322d35a60d59331a7f7 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 9 Nov 2017 08:27:37 -0200 Subject: Fix: unselectable objects can be selected via the NLA editor This is not reported anywhere, but it's easy to reproduce. I ran into this while updating this code for the blender2.8 branch. --- source/blender/editors/space_nla/nla_channels.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_nla') diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index e9c46e9d04b..c261821db16 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 && (ob->restrictflag & OB_RESTRICT_SELECT) == 0) { /* set selection status */ if (selectmode == SELECT_INVERT) { /* swap select */ -- cgit v1.2.3