svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22205:22290
authorCampbell Barton <ideasman42@gmail.com>
Fri, 7 Aug 2009 04:41:15 +0000 (04:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 7 Aug 2009 04:41:15 +0000 (04:41 +0000)
1  2 
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Ketsji/KX_Scene.cpp

@@@ -908,11 -918,9 +893,11 @@@ void     KX_BlenderSceneConverter::TestHand
                        {
                                //KX_IPhysicsController* physCtrl = gameObj->GetPhysicsController();
                                
-                               Object* blenderObject = FindBlenderObject(gameObj);
+                               Object* blenderObject = gameObj->GetBlenderObject();
                                if (blenderObject && blenderObject->ipo)
                                {
 +                                      // XXX animato
 +#if 0
                                        Ipo* ipo = blenderObject->ipo;
                                        
                                        //create the curves, if not existing
@@@ -56,16 -56,12 +56,12 @@@ class KX_BlenderSceneConverter : publi
        // Should also have a list of collision shapes. 
        // For the time being this is held in KX_Scene::m_shapes
  
-       GEN_Map<CHashedPtr,struct Object*> m_map_gameobject_to_blender;
-       GEN_Map<CHashedPtr,KX_GameObject*> m_map_blender_to_gameobject;
-       GEN_Map<CHashedPtr,RAS_MeshObject*> m_map_mesh_to_gamemesh;
- //    GEN_Map<CHashedPtr,DT_ShapeHandle> m_map_gamemesh_to_sumoshape;
-       
-       GEN_Map<CHashedPtr,SCA_IActuator*> m_map_blender_to_gameactuator;
-       GEN_Map<CHashedPtr,SCA_IController*> m_map_blender_to_gamecontroller;
+       GEN_Map<CHashedPtr,KX_GameObject*>      m_map_blender_to_gameobject;            /* cleared after conversion */
+       GEN_Map<CHashedPtr,RAS_MeshObject*>     m_map_mesh_to_gamemesh;                         /* cleared after conversion */
+       GEN_Map<CHashedPtr,SCA_IActuator*>      m_map_blender_to_gameactuator;          /* cleared after conversion */
+       GEN_Map<CHashedPtr,SCA_IController*>m_map_blender_to_gamecontroller;    /* cleared after conversion */
        
 -      GEN_Map<CHashedPtr,BL_InterpolatorList*> m_map_blender_to_gameipolist;  /* kept, should be freed, TODO */
 +      GEN_Map<CHashedPtr,BL_InterpolatorList*> m_map_blender_to_gameAdtList;
        
        Main*                                   m_maggie;
  
Simple merge