From fb53a328b4de86c1ec5f741f4a206037981f8428 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 20 Aug 2002 21:43:32 +0000
Subject: [PATCH] generalize for butterflies

---
 direct/src/interval/ActorInterval.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/direct/src/interval/ActorInterval.py b/direct/src/interval/ActorInterval.py
index e030433c34..be9a9e281e 100644
--- a/direct/src/interval/ActorInterval.py
+++ b/direct/src/interval/ActorInterval.py
@@ -165,8 +165,10 @@ class LerpAnimInterval(Interval.Interval):
         w = self.startWeight + t * self.deltaWeight
 
         # Apply that weight to the two anims.
-        self.actor.setControlEffect(self.endAnim, w)
-        self.actor.setControlEffect(self.startAnim, 1.0 - w)
+        if self.startAnim != None:
+            self.actor.setControlEffect(self.startAnim, 1.0 - w)
+        if self.endAnim != None:
+            self.actor.setControlEffect(self.endAnim, w)
 
 
     def getBlend(self, blendType):