svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
authorCampbell Barton <ideasman42@gmail.com>
Fri, 31 Jul 2009 23:42:22 +0000 (23:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 31 Jul 2009 23:42:22 +0000 (23:42 +0000)
16 files changed:
1  2 
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Expressions/Value.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_NearSensor.h
source/gameengine/Ketsji/KX_PolygonMaterial.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RadarSensor.h

index 1a211a64b35ff87ed683c0b8e994233902475c97,b71215645b4e3cbe4a362757ee9c5b11644f28a1..6871aeebc7642a6862a43c64e5a62b035753c43c
@@@ -47,14 -47,14 +47,12 @@@ KX_NearSensor::KX_NearSensor(SCA_EventM
                                                         float resetmargin,
                                                         bool bFindMaterial,
                                                         const STR_String& touchedpropname,
-                                                        class KX_Scene* scene,
 -                                                       PHY_IPhysicsController*        ctrl,
 -                                                       PyTypeObject* T)
 +                                                       PHY_IPhysicsController* ctrl)
                         :KX_TouchSensor(eventmgr,
                                                         gameobj,
                                                         bFindMaterial,
                                                         false,
-                                                        touchedpropname
-                                                        /*, scene */),
 -                                                       touchedpropname,
 -                                                       T),
++                                                       touchedpropname),
                         m_Margin(margin),
                         m_ResetMargin(resetmargin)
  
index f3c1d74805c6bfce520dfa0317999e50cab515d6,88292242a5ddd335a1c7ed29ff1faf70f3efe4d4..03d6f830579c5d88a854d39cf1479a006abb8f0f
@@@ -53,8 -53,8 +53,7 @@@ public
                        float resetmargin,
                        bool bFindMaterial,
                        const STR_String& touchedpropname,
-                       class KX_Scene* scene,
 -                       PHY_IPhysicsController*        ctrl,
 -                      PyTypeObject* T=&Type);
 +                       PHY_IPhysicsController*        ctrl);
  /*
  public:
        KX_NearSensor(class SCA_EventManager* eventmgr,
index e39d3756b716b30bf8088ad369f38bb0e4cadec9,76ecc2351508a0830fc2e76b9d1eef6d91a52bf6..8ac94a324f2728551de88106c5a2770bcd5c42f2
@@@ -48,8 -48,8 +48,7 @@@ KX_RadarSensor::KX_RadarSensor(SCA_Even
                        double margin,
                        double resetmargin,
                        bool bFindMaterial,
--                      const STR_String& touchedpropname,
-                       class KX_Scene* kxscene)
 -                      PyTypeObject* T)
++                      const STR_String& touchedpropname)
  
                        : KX_NearSensor(
                                eventmgr,
@@@ -59,9 -59,8 +58,8 @@@
                                resetmargin,
                                bFindMaterial,
                                touchedpropname,
-                               kxscene,
 -                              physCtrl,
 -                              T),
 +                              physCtrl),
 +
                                m_coneradius(coneradius),
                                m_coneheight(coneheight),
                                m_axis(axis)
index 344be0e399f0722bf13252e89bacf2cf56a7639d,5eb57bdc3e0dcfbfb2e8b4370f33e895c1f321c5..9f38d75abc47593a11a35aa159b8a3514f81f429
@@@ -69,8 -69,8 +69,7 @@@ public
                        double margin,
                        double resetmargin,
                        bool bFindMaterial,
--                      const STR_String& touchedpropname,
-                       class KX_Scene* kxscene);
 -                      PyTypeObject* T = &Type);
++                      const STR_String& touchedpropname);
        KX_RadarSensor();
        virtual ~KX_RadarSensor();
        virtual void SynchronizeTransform();