[Bf-blender-cvs] [32ff863] compositor-2016: Fix T48529: NLA : viewport not updated after Track muted/unmuted.

Bastien Montagne noreply at git.blender.org
Wed Jun 8 21:50:53 CEST 2016


Commit: 32ff8637128b3455d51b318184fbe07e0595348c
Author: Bastien Montagne
Date:   Sat May 28 19:50:05 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB32ff8637128b3455d51b318184fbe07e0595348c

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.

===================================================================

M	source/blender/editors/animation/anim_deps.c

===================================================================

diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index 5665ce5..437dd2b 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);
 	}
 }




More information about the Bf-blender-cvs mailing list