[Bf-blender-cvs] [4bd2609] master: Quiet assert in debug mode, deleting mask/gpencil keys

Campbell Barton noreply at git.blender.org
Mon Jun 9 13:06:57 CEST 2014


Commit: 4bd2609cd0297fcfe5d8f7b47c64f02c4275a4d7
Author: Campbell Barton
Date:   Mon Jun 9 20:03:28 2014 +1000
https://developer.blender.org/rB4bd2609cd0297fcfe5d8f7b47c64f02c4275a4d7

Quiet assert in debug mode, deleting mask/gpencil keys

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

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 5bffdfb..1ca2c24 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -349,8 +349,15 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data)
 {
 	bAnimListElem *ale;
 
-	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
+#ifdef DEBUG
+		/* quiet assert */
+		for (ale = anim_data->first; ale; ale = ale->next) {
+			ale->update = 0;
+		}
+#endif
 		return;
+	}
 
 	for (ale = anim_data->first; ale; ale = ale->next) {
 		FCurve *fcu = ale->key_data;




More information about the Bf-blender-cvs mailing list