Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BGE: Fix wrong current logic manager in collision callback.

Browse Source
This commit is contained in:
Porteries Tristan
2015-07-07 13:36:47 +02:00
parent 1d021956f5
commit 0c14a897dd
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/gameengine/Ketsji/KX_GameObject.cpp
View File

@@ -1583,6 +1583,14 @@ void KX_GameObject::RunCollisionCallbacks(KX_GameObject *collider, const MT_Vect
if (!m_collisionCallbacks || PyList_GET_SIZE(m_collisionCallbacks) == 0) if (!m_collisionCallbacks || PyList_GET_SIZE(m_collisionCallbacks) == 0)
return; return;
/** Current logic controller is set by each python logic bricks before run,
* but if no python logic brick ran the logic manager can be wrong
* (if the user use muti scenes) and it will cause problems with function
* ConvertPythonToGameObject which use the current logic manager for object's name.
* Note: the scene is already set in logic frame loop.
*/
SCA_ILogicBrick::m_sCurrentLogicManager = GetScene()->GetLogicManager();
PyObject *args[] = {collider->GetProxy(), PyObjectFrom(point), PyObjectFrom(normal)}; PyObject *args[] = {collider->GetProxy(), PyObjectFrom(point), PyObjectFrom(normal)};
RunPythonCallBackList(m_collisionCallbacks, args, 1, ARRAY_SIZE(args)); RunPythonCallBackList(m_collisionCallbacks, args, 1, ARRAY_SIZE(args));