From 3aee5472f8032e51ca321cbe5ccbbb8e6698b066 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Fri, 1 Nov 2013 22:34:38 -0400
Subject: [PATCH] ActorMultiTexture: warn on adding nil

---
 src/ActorMultiTexture.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ActorMultiTexture.cpp b/src/ActorMultiTexture.cpp
index 5c8879aeb6..e5bb2f0099 100644
--- a/src/ActorMultiTexture.cpp
+++ b/src/ActorMultiTexture.cpp
@@ -65,7 +65,11 @@ void ActorMultiTexture::ClearTextures()
 
 int ActorMultiTexture::AddTexture( RageTexture *pTexture )
 {
-	ASSERT( pTexture != NULL );
+	if( pTexture == NULL )
+	{
+		LOG->Warn( "Can't add nil texture to ActorMultiTexture" );
+		return m_aTextureUnits.size();
+	}
 	LOG->Trace( "ActorMultiTexture::AddTexture( %s )", pTexture->GetID().filename.c_str() );
 
 	m_aTextureUnits.push_back( TextureUnitState() );