soc-2008-mxcurioni: merged changes to revision 15705
[blender.git] / source / gameengine / SceneGraph / SG_IObject.cpp
index c347bbc6d9a5c4b652253995fcb1f9ffe45ec4bd..d0bdac5c8f0215b1a09e28c5ef0713bc8617cad3 100644 (file)
@@ -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