diff options
| author | Nate Rupsis <C-Nathaniel.Rupsis@charter.com> | 2022-09-29 00:06:55 +0300 |
|---|---|---|
| committer | Nate Rupsis <nrupsis@gmail.com> | 2022-10-07 19:03:24 +0300 |
| commit | f96b729d7b5a6406fab07108b1cbbbd07b635d51 (patch) | |
| tree | 9ac20b299e953e7b1c9beb5ae9712e50f7581947 /source/blender/editors/space_nla | |
| parent | 9cf2b413c2f3d138077859eaa795a459b7996e8e (diff) | |
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
Diffstat (limited to 'source/blender/editors/space_nla')
| -rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 6 |
1 files changed, 5 insertions, 1 deletions
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) { |