Allow null firedEvents.

fr3sh · Oct 3, 2013 · 748431b · 748431b
1 parent f33c621
commit 748431b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/spine-c/src/spine/Animation.c b/spine-c/src/spine/Animation.c
@@ -515,6 +515,7 @@ void AttachmentTimeline_setFrame (AttachmentTimeline* self, int frameIndex, floa
 
 void _EventTimeline_apply (const Timeline* timeline, Skeleton* skeleton, float lastTime, float time, Event** firedEvents,
 		int* eventCount, float alpha) {
+	if (!firedEvents) return;
 	EventTimeline* self = (EventTimeline*)timeline;
 	int frameIndex;
 

diff --git a/spine-csharp/src/Animation.cs b/spine-csharp/src/Animation.cs
@@ -460,6 +460,7 @@ public void setFrame (int frameIndex, float time, Event e) {
 		}
 
 		public void Apply (Skeleton skeleton, float lastTime, float time, List<Event> firedEvents, float alpha) {
+			if (firedEvents == null) return;
 			float[] frames = this.frames;
 			int frameCount = frames.Length;
 

diff --git a/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
@@ -534,6 +534,7 @@ public void setFrame (int frameIndex, float time, Event event) {
 		}
 
 		public void apply (Skeleton skeleton, float lastTime, float time, Array<Event> firedEvents, float alpha) {
+			if (firedEvents == null) return;
 			float[] frames = this.frames;
 			int frameCount = frames.length;