[Bf-blender-cvs] [49aff41] master: Fix T40912: Collision Callbacks Don't Work if Set Directly

Mitchell Stokes noreply at git.blender.org
Thu Jul 3 05:20:56 CEST 2014


Commit: 49aff416f8db98d858cb4c822ad4425377fc7acd
Author: Mitchell Stokes
Date:   Wed Jul 2 20:15:36 2014 -0700
https://developer.blender.org/rB49aff416f8db98d858cb4c822ad4425377fc7acd

Fix T40912: Collision Callbacks Don't Work if Set Directly

===================================================================

M	source/gameengine/Ketsji/KX_GameObject.cpp

===================================================================

diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 7b78134..44646f1 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -2188,9 +2188,15 @@ int KX_GameObject::pyattr_set_collisionCallbacks(void *self_v, const KX_PYATTRIB
 		return PY_SET_ATTR_FAIL;
 	}
 
-	Py_XDECREF(self->m_collisionCallbacks);
+	if (self->m_collisionCallbacks == NULL) {
+		self->RegisterCollisionCallbacks();
+	} else {
+		Py_DECREF(self->m_collisionCallbacks);
+	}
+
 	Py_INCREF(value);
 
+
 	self->m_collisionCallbacks = value;
 
 	return PY_SET_ATTR_SUCCESS;




More information about the Bf-blender-cvs mailing list