diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-10-22 18:19:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-10-22 18:19:55 +0300 |
| commit | 9f560219751240cc15a8de0b2e485e1538fee642 (patch) | |
| tree | feab8d3cbc9c64bf12ef668a3dfe987e84f29e29 | |
| parent | 8bb211a771642144ac75ba6be0c1897c836a6276 (diff) | |
Fix T101930: NLA Actions Stash remove doesn't work on overriden linked data.
Code adding stash track was clearing out track flags, instead of editing
them as it should have...
Note that there are a lot of other weaknesses in action stash code (like
relying on the (translated!!!!!!) name of the track to know whether it's
a stah or not).
| -rw-r--r-- | source/blender/blenkernel/intern/nla.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index ba63cdff917..24663d6db05 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1918,7 +1918,7 @@ bool BKE_nla_action_stash(AnimData *adt, const bool is_liboverride) * NOTE: this must be done *after* adding the strip to the track, or else * the strip locking will prevent the strip from getting added */ - nlt->flag = (NLATRACK_MUTED | NLATRACK_PROTECTED); + nlt->flag |= (NLATRACK_MUTED | NLATRACK_PROTECTED); strip->flag &= ~(NLASTRIP_FLAG_SELECT | NLASTRIP_FLAG_ACTIVE); /* also mark the strip for auto syncing the length, so that the strips accurately |