From f96b729d7b5a6406fab07108b1cbbbd07b635d51 Mon Sep 17 00:00:00 2001 From: Nate Rupsis Date: Wed, 28 Sep 2022 15:06:55 -0600 Subject: FIX T101275: Regression in NLA causes Actions to be ignored by Context menu (I.e influence, etc) Reviewed By: sybren Differential Revision: http://developer.blender.org/D16154 --- source/blender/editors/space_nla/nla_buttons.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_nla') diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index a46da391bdc..4aff3766b12 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -107,7 +107,6 @@ bool nla_panel_context(const bContext *C, found = 1; break; } - case ANIMTYPE_NLAACTION: case ANIMTYPE_SCENE: /* Top-Level Widgets doubling up as datablocks */ case ANIMTYPE_OBJECT: case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */ @@ -158,6 +157,11 @@ bool nla_panel_context(const bContext *C, } break; } + /* Don't set a pointer for NLA Actions. + * This will break the dependency graph for the context menu. + */ + case ANIMTYPE_NLAACTION: + break; } if (found > 0) { -- cgit v1.2.3