kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

remove ray sensors own logic manager (now stored in parent class) + other minor changes.

Browse Source
This commit is contained in:
Campbell Barton 2009-09-29 07:51:54 +00:00
parent 64a093ea77
commit c8b7384c4b
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@ -838,8 +838,10 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene,
if (mface->v4)
tan3 = tangent[f*4 + 3];
}
ma = give_current_material(blenderobj, mface->mat_nr+1);
if(blenderobj)
ma = give_current_material(blenderobj, mface->mat_nr+1);
else
ma = mesh->mat ? mesh->mat[mface->mat_nr]:NULL;
{
bool visible = true;

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

@ -142,6 +142,8 @@ KX_GameObject::~KX_GameObject()
(*contit)->ClearObject();
}
m_pSGNode->SetSGClientObject(NULL);
/* m_pSGNode is freed in KX_Scene::RemoveNodeDestructObject */
}
if (m_pGraphicController)
{

2
source/gameengine/Ketsji/KX_RayEventManager.h
View File

@ -37,8 +37,6 @@ using namespace std;
class KX_RayEventManager : public SCA_EventManager
{
class SCA_LogicManager* m_logicmgr;
public:
KX_RayEventManager(class SCA_LogicManager* logicmgr)
: SCA_EventManager(logicmgr, RAY_EVENTMGR)

2
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
View File

@ -593,7 +593,7 @@ bool CcdPhysicsController::ReplaceControllerShape(btCollisionShape *newShape)
for(int i= 0; i < obarr.size(); i++) {
ob= obarr[i];
if (ob->getCollisionShape() == newShape); {
proxy = obarr[i]->getBroadphaseHandle();
proxy = ob->getBroadphaseHandle();
if(proxy)
dw->getPairCache()->cleanProxyFromPairs(proxy,dw->getDispatcher());