[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23552] trunk/blender/source/gameengine: remove ray sensors own logic manager (now stored in parent class) + other minor changes.

[Campbell Barton]

Revision: 23552
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23552
Author:   campbellbarton
Date:     2009-09-29 09:51:54 +0200 (Tue, 29 Sep 2009)

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

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h
    trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp      
2009-09-29 05:22:44 UTC (rev 23551)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp      
2009-09-29 07:51:54 UTC (rev 23552)
@@ -838,9 +838,11 @@
                        if (mface->v4)
                                tan3 = tangent[f*4 + 3];
                }
+               if(blenderobj)
+                       ma = give_current_material(blenderobj, mface->mat_nr+1);
+               else
+                       ma = mesh->mat ? mesh->mat[mface->mat_nr]:NULL;
 
-               ma = give_current_material(blenderobj, mface->mat_nr+1);
-
                {
                        bool visible = true;
                        bool twoside = false;

Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp    2009-09-29 
05:22:44 UTC (rev 23551)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp    2009-09-29 
07:51:54 UTC (rev 23552)
@@ -142,6 +142,8 @@
                        (*contit)->ClearObject();
                }
                m_pSGNode->SetSGClientObject(NULL);
+
+               /* m_pSGNode is freed in KX_Scene::RemoveNodeDestructObject */
        }
        if (m_pGraphicController)
        {

Modified: trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h 2009-09-29 
05:22:44 UTC (rev 23551)
+++ trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h 2009-09-29 
07:51:54 UTC (rev 23552)
@@ -37,8 +37,6 @@
 
 class KX_RayEventManager : public SCA_EventManager
 {
-
-       class SCA_LogicManager* m_logicmgr;
 public:
        KX_RayEventManager(class SCA_LogicManager* logicmgr)
                : SCA_EventManager(logicmgr, RAY_EVENTMGR)

Modified: 
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp     
2009-09-29 05:22:44 UTC (rev 23551)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp     
2009-09-29 07:51:54 UTC (rev 23552)
@@ -593,7 +593,7 @@
        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());


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs