Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-05-28 20:50:05 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-05-28 20:52:31 +0300
commit362bd116d95e2a0a41a35f5676b16ebc99030141 (patch)
tree2c4c05f5facdfd08930822f77d75e1f1a2d20756 /source/blender/editors/animation/anim_deps.c
parent8e2611102090939f90fd5414e3717866f240020b (diff)
Fix T48529: NLA : viewport not updated after Track muted/unmuted.
Not sure why, but ANIM_animdata_update() totally ignored NLAStrip type of bAnimListElem. For now only added support for ANIM_UPDATE_DEPS type of update, don't know whether others are needed in this case or not... time will say.
Diffstat (limited to 'source/blender/editors/animation/anim_deps.c')
-rw-r--r--source/blender/editors/animation/anim_deps.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index 5665ce59783..437dd2b2de2 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -399,7 +399,13 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data)
ANIM_list_elem_update(ac->scene, ale);
}
}
-
+ else if (ale->datatype == ALE_NLASTRIP) {
+ if (ale->update & ANIM_UPDATE_DEPS) {
+ ale->update &= ~ANIM_UPDATE_DEPS;
+ ANIM_list_elem_update(ac->scene, ale);
+ }
+ }
+
BLI_assert(ale->update == 0);
}
}