svn merge -r 15590:15688 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-07-22 12:02:57 +00:00
parent 06f67dd531
commit aec6b78ded
98 changed files with 5733 additions and 818 deletions
--- a/source/gameengine/SceneGraph/SG_IObject.cpp
+++ b/source/gameengine/SceneGraph/SG_IObject.cpp
@@ -104,7 +104,7 @@ SetSGClientObject(
 }


-	void
+	bool
 SG_IObject::
 ActivateReplicationCallback(
 	SG_IObject *replica
@@ -112,8 +112,10 @@ ActivateReplicationCallback(
 	if (m_callbacks.m_replicafunc)
 	{
 		// Call client provided replication func
-		m_callbacks.m_replicafunc(replica,m_SGclientObject,m_SGclientInfo);
+		if (m_callbacks.m_replicafunc(replica,m_SGclientObject,m_SGclientInfo) == NULL)
+			return false;
 	}
+	return true;
 };	

 	void