From 6dd4f6020e010f13508c0fe2a3f6c3b7d430fe9a Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 1 Nov 2006 15:33:45 +0000 Subject: 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. --- source/blender/blenkernel/intern/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel') 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; -- cgit v1.2.3