From 4e71f065426bd1bcceb6879e1be80f69a3c6f795 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Fri, 3 Nov 2006 08:40:18 +0000 Subject: [PATCH] Fix for new Action Modifier: when a Action strip exactly ends where another strip begins, the deformation was applied twice. Strip blending for modifiers has to be implemented still... --- source/blender/blenkernel/intern/armature.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index fe703007e50..570a9d3d589 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1603,6 +1603,10 @@ static void do_strip_modifiers(Object *armob, Bone *bone, bPoseChannel *pchan) for (strip=armob->nlastrips.first; strip; strip=strip->next) { if(scene_cfra>=strip->start && scene_cfra<=strip->end) { + /* temporal solution to prevent 2 strips accumulating */ + if(scene_cfra==strip->end && strip->next && strip->next->start==scene_cfra) + continue; + for(amod= strip->modifiers.first; amod; amod= amod->next) { if(amod->type==ACTSTRIP_MOD_DEFORM) { /* validate first */