diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-11-01 18:33:45 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-11-01 18:33:45 +0300 |
| commit | 6dd4f6020e010f13508c0fe2a3f6c3b7d430fe9a (patch) | |
| tree | 6214f4c129f37f47995d0e834e8a5b74a2c15dd4 /source/blender/blenkernel | |
| parent | f5fc880a41d990a337df6e0c2e6743a54da043fd (diff) | |
Patch #4848, Joshua Leung
NLA Strip "Mute" option, to temporally disable a strip. Option only in
Properties panel still, should be in menus and hotkey.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index fca4fcb2466..17910c01fa3 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -1044,7 +1044,7 @@ static void do_nla(Object *ob, int blocktype) for (strip=ob->nlastrips.first; strip; strip=strip->next){ doit=dostride= 0; - if (strip->act){ /* so theres an action */ + if (strip->act && !(strip->flag & ACTSTRIP_MUTE)) { /* so theres an action */ /* Determine if the current frame is within the strip's range */ length = strip->end-strip->start; |