diff options
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 6 | ||||
m--------- | source/tools | 0 |
2 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) { diff --git a/source/tools b/source/tools -Subproject 2ab59df2c987d383a7ed9dbcd4f3897bbba7c12 +Subproject 2a541f164a222ef7bcd036d37687738acee8d94 |