blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

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
This commit is contained in:
Nate Rupsis 2022-09-28 15:06:55 -06:00 committed by Philipp Oeser
parent fcc291bbf9
commit bfc9d7cadf
Notes: blender-bot 2023-02-14 06:17:17 +01:00 
Referenced by issue #100749, Blender LTS: Maintenance Task 3.3
Referenced by issue #101275, Regression: Edited action in NLA ignored settings
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_nla/nla_buttons.c
View File

@ -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) {