[Csp-commits] svn:csp r1653 - trunk/CSP/CSPSim/Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-10-16 15:08:31 -0700 (Sun, 16 Oct 2005)
New Revision: 1653

Modified:
   trunk/CSP/CSPSim/Source/Animation.cpp
Log:
Remove more overzealous asserts for missing channels.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1653

Modified: trunk/CSP/CSPSim/Source/Animation.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Animation.cpp	2005-10-16 22:06:04 UTC (rev 1652)
+++ trunk/CSP/CSPSim/Source/Animation.cpp	2005-10-16 22:08:31 UTC (rev 1653)
@@ -149,11 +149,11 @@
 		int value = -2;
 		std::string token;
 		if (m_Channel.valid()) {
+			if (!m_Channel) return false;
 			value = m_Channel->value().getValue();
 			if (value == m_Value) return false;
 			token = m_Channel->value().getToken();
 		} else {
-			assert(m_BoolChannel.valid());
 			if (!m_BoolChannel) return false;
 			value = m_BoolChannel->value() ? 1 : 0;
 			if (value == m_Value) return false;
@@ -200,7 +200,6 @@
 				e.cycle(); // TODO push
 			}
 		} else {
-			assert(m_BoolChannel.valid());
 			if (m_BoolChannel.valid()) {
 				if (m_BoolChannel->isShared()) {
 					bool &b = const_cast<bool&>(m_BoolChannel->value());