diff options
Diffstat (limited to 'source/gameengine/Ketsji')
44 files changed, 48 insertions, 48 deletions
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h index 41802a0a19f..32872592cc5 100644 --- a/source/gameengine/Ketsji/BL_Shader.h +++ b/source/gameengine/Ketsji/BL_Shader.h @@ -116,7 +116,7 @@ public: */ class BL_Shader : public PyObjectPlus { - Py_Header; + Py_Header private: typedef std::vector<BL_Uniform*> BL_UniformVec; typedef std::vector<BL_DefUniform*> BL_UniformVecDef; diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h index a7db2ed1660..f3447356055 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h @@ -39,7 +39,7 @@ class KX_NetworkMessageActuator : public SCA_IActuator { - Py_Header; + Py_Header bool m_lastEvent; class NG_NetworkScene* m_networkscene; // needed for replication STR_String m_toPropName; diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h index 7ec8f26f8ce..75800d9b9fa 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h @@ -40,7 +40,7 @@ class NG_NetworkScene; class KX_NetworkMessageSensor : public SCA_ISensor { // note: Py_Header MUST BE the first listed here - Py_Header; + Py_Header NG_NetworkScene *m_NetworkScene; // The subject we filter on. diff --git a/source/gameengine/Ketsji/KX_ArmatureSensor.h b/source/gameengine/Ketsji/KX_ArmatureSensor.h index 1b0168266a3..683a54f65de 100644 --- a/source/gameengine/Ketsji/KX_ArmatureSensor.h +++ b/source/gameengine/Ketsji/KX_ArmatureSensor.h @@ -40,7 +40,7 @@ struct bConstraint; class KX_ArmatureSensor : public SCA_ISensor { - Py_Header; + Py_Header //class CExpression* m_rightexpr; protected: diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index 236bd6afdc8..2736516bf33 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -32,7 +32,7 @@ class KX_Scene; class KX_BlenderMaterial : public PyObjectPlus, public RAS_IPolyMaterial { - Py_Header; + Py_Header public: // -------------------------------- KX_BlenderMaterial(); diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h index 236e914b9e5..e9c4e99aa3b 100644 --- a/source/gameengine/Ketsji/KX_Camera.h +++ b/source/gameengine/Ketsji/KX_Camera.h @@ -50,7 +50,7 @@ bool ConvertPythonToCamera(PyObject * value, KX_Camera **object, bool py_none_ok class KX_Camera : public KX_GameObject { - Py_Header; + Py_Header protected: friend class KX_Scene; /** Camera parameters (clips distances, focal length). These diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h index c06904ea56b..a6344ae380a 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.h +++ b/source/gameengine/Ketsji/KX_CameraActuator.h @@ -49,7 +49,7 @@ class KX_CameraActuator : public SCA_IActuator { - Py_Header; + Py_Header private : /** Object that will be tracked. */ SCA_IObject *m_ob; diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h index ebaeed9aafe..b513b141f3e 100644 --- a/source/gameengine/Ketsji/KX_ConstraintActuator.h +++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h @@ -42,7 +42,7 @@ class KX_GameObject; class KX_ConstraintActuator : public SCA_IActuator { - Py_Header; + Py_Header protected: // Damp time (int), int m_posDampTime; diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h index 8f559881a2e..980221bd4b3 100644 --- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h +++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h @@ -37,7 +37,7 @@ class KX_ConstraintWrapper : public PyObjectPlus { - Py_Header; + Py_Header public: KX_ConstraintWrapper(PHY_ConstraintType ctype,int constraintId,class PHY_IPhysicsEnvironment* physenv); virtual ~KX_ConstraintWrapper (); diff --git a/source/gameengine/Ketsji/KX_FontObject.h b/source/gameengine/Ketsji/KX_FontObject.h index 15d455b7313..8fc7a9e9f28 100644 --- a/source/gameengine/Ketsji/KX_FontObject.h +++ b/source/gameengine/Ketsji/KX_FontObject.h @@ -38,7 +38,7 @@ class KX_FontObject : public KX_GameObject { public: - Py_Header; + Py_Header KX_FontObject( void* sgReplicationInfo, SG_Callbacks callbacks, RAS_IRenderTools* rendertools, diff --git a/source/gameengine/Ketsji/KX_GameActuator.h b/source/gameengine/Ketsji/KX_GameActuator.h index 1c05d152d39..ebc6712a2dd 100644 --- a/source/gameengine/Ketsji/KX_GameActuator.h +++ b/source/gameengine/Ketsji/KX_GameActuator.h @@ -40,7 +40,7 @@ class KX_GameActuator : public SCA_IActuator { - Py_Header; + Py_Header protected: int m_mode; bool m_restart; diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index d3ed9991c31..c240a7fcf84 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -1880,7 +1880,7 @@ PyTypeObject KX_GameObject::Type = { PyObject* KX_GameObject::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); - return PyUnicode_FromString(self->GetName().ReadPtr()); + return PyUnicode_From_STR_String(self->GetName()); } PyObject* KX_GameObject::pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) @@ -2683,7 +2683,7 @@ PyObject* KX_GameObject::PyGetPhysicsId() PyObject* KX_GameObject::PyGetPropertyNames() { - PyObject *list= ConvertKeysToPython(); + PyObject *list= ConvertKeysToPython(); if(m_attr_dict) { PyObject *key, *value; diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 69bc394cbfc..245a92a96de 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -80,7 +80,7 @@ void KX_GameObject_Mathutils_Callback_Init(void); */ class KX_GameObject : public SCA_IObject { - Py_Header; + Py_Header protected: bool m_bDyna; diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h index 5ee008ac5e3..fa26bbaa6e1 100644 --- a/source/gameengine/Ketsji/KX_IpoActuator.h +++ b/source/gameengine/Ketsji/KX_IpoActuator.h @@ -37,7 +37,7 @@ class KX_IpoActuator : public SCA_IActuator { - Py_Header; + Py_Header private: /** Computes the IPO start time from the current time and the current frame. */ diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h index cd472311bcf..bb081e6a444 100644 --- a/source/gameengine/Ketsji/KX_Light.h +++ b/source/gameengine/Ketsji/KX_Light.h @@ -44,7 +44,7 @@ class MT_Transform; class KX_LightObject : public KX_GameObject { - Py_Header; + Py_Header protected: RAS_LightObject m_lightobj; class RAS_IRenderTools* m_rendertools; //needed for registering and replication of lightobj diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp index 754ad511669..fec1d9d296c 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.cpp +++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp @@ -129,7 +129,7 @@ PyObject* KX_MeshProxy::PyGetMaterialName(PyObject* args, PyObject* kwds) return NULL; } - return PyUnicode_FromString(matname.Ptr()); + return PyUnicode_From_STR_String(matname); } @@ -147,7 +147,7 @@ PyObject* KX_MeshProxy::PyGetTextureName(PyObject* args, PyObject* kwds) return NULL; } - return PyUnicode_FromString(matname.Ptr()); + return PyUnicode_From_STR_String(matname); } diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h index d5292b5108d..f59418a5de2 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.h +++ b/source/gameengine/Ketsji/KX_MeshProxy.h @@ -41,7 +41,7 @@ bool ConvertPythonToMesh(PyObject * value, class RAS_MeshObject **object, bool p class KX_MeshProxy : public CValue { - Py_Header; + Py_Header class RAS_MeshObject* m_meshobj; public: diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h index 5fb576eec28..277af87f9f2 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h @@ -47,7 +47,7 @@ class KX_RayCast; class KX_MouseFocusSensor : public SCA_MouseSensor { - Py_Header; + Py_Header public: diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.h b/source/gameengine/Ketsji/KX_NavMeshObject.h index 287b2b24fa9..ad128a0891d 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.h +++ b/source/gameengine/Ketsji/KX_NavMeshObject.h @@ -36,7 +36,7 @@ class MT_Transform; class KX_NavMeshObject: public KX_GameObject { - Py_Header; + Py_Header protected: dtStatNavMesh* m_navMesh; diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h index 1caea59867a..26adcb993b8 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.h +++ b/source/gameengine/Ketsji/KX_NearSensor.h @@ -41,7 +41,7 @@ struct PHY_CollData; class KX_NearSensor : public KX_TouchSensor { - Py_Header; + Py_Header protected: float m_Margin; float m_ResetMargin; diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h index fc6fcb66e28..aa0f844eb88 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.h +++ b/source/gameengine/Ketsji/KX_ObjectActuator.h @@ -80,7 +80,7 @@ struct KX_LocalFlags { class KX_ObjectActuator : public SCA_IActuator { - Py_Header; + Py_Header MT_Vector3 m_force; MT_Vector3 m_torque; diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h index 8531675723a..484b137c2f5 100644 --- a/source/gameengine/Ketsji/KX_ParentActuator.h +++ b/source/gameengine/Ketsji/KX_ParentActuator.h @@ -41,7 +41,7 @@ class KX_ParentActuator : public SCA_IActuator { - Py_Header; + Py_Header /** Mode */ int m_mode; diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h index 0e4c2e71f3e..4f03c8fbfb1 100644 --- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h +++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h @@ -37,7 +37,7 @@ class KX_PhysicsObjectWrapper : public PyObjectPlus { - Py_Header; + Py_Header public: KX_PhysicsObjectWrapper(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsEnvironment* physenv); virtual ~KX_PhysicsObjectWrapper(); diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp index 82a93e76cf3..caef8ba5e2e 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.cpp +++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp @@ -216,13 +216,13 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_PolyProxy, isCollider, KX_PYMETHODDEF_DOC_NOARGS(KX_PolyProxy, getMaterialName, "getMaterialName() : returns the polygon material name, \"NoMaterial\" if no material\n") { - return PyUnicode_FromString(m_polygon->GetMaterial()->GetPolyMaterial()->GetMaterialName()); + return PyUnicode_From_STR_String(m_polygon->GetMaterial()->GetPolyMaterial()->GetMaterialName()); } KX_PYMETHODDEF_DOC_NOARGS(KX_PolyProxy, getTextureName, "getTexturelName() : returns the polygon texture name, \"NULL\" if no texture\n") { - return PyUnicode_FromString(m_polygon->GetMaterial()->GetPolyMaterial()->GetTextureName()); + return PyUnicode_From_STR_String(m_polygon->GetMaterial()->GetPolyMaterial()->GetTextureName()); } KX_PYMETHODDEF_DOC(KX_PolyProxy, getVertexIndex, diff --git a/source/gameengine/Ketsji/KX_PolyProxy.h b/source/gameengine/Ketsji/KX_PolyProxy.h index d8046b3fec6..44945e58c2a 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.h +++ b/source/gameengine/Ketsji/KX_PolyProxy.h @@ -38,7 +38,7 @@ class KX_PolyProxy : public CValue { - Py_Header; + Py_Header protected: class RAS_Polygon* m_polygon; class RAS_MeshObject* m_mesh; diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp index 3147d6ba4c9..29127ec11a0 100644 --- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp +++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp @@ -346,13 +346,13 @@ KX_PYMETHODDEF_DOC(KX_PolygonMaterial, activate, "activate(rasty, cachingInfo)") PyObject* KX_PolygonMaterial::pyattr_get_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v); - return PyUnicode_FromString(self->m_texturename.ReadPtr()); + return PyUnicode_From_STR_String(self->m_texturename); } PyObject* KX_PolygonMaterial::pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v); - return PyUnicode_FromString(self->m_materialname.ReadPtr()); + return PyUnicode_From_STR_String(self->m_materialname); } /* this does not seem useful */ diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.h b/source/gameengine/Ketsji/KX_PolygonMaterial.h index 78876c60409..f20a90f7deb 100644 --- a/source/gameengine/Ketsji/KX_PolygonMaterial.h +++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h @@ -55,7 +55,7 @@ struct Image; */ class KX_PolygonMaterial : public PyObjectPlus, public RAS_IPolyMaterial { - Py_Header; + Py_Header private: /** Blender texture face structure. */ MTFace* m_tface; diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h index 422313fcfef..ee803d9bdb9 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.h +++ b/source/gameengine/Ketsji/KX_RadarSensor.h @@ -41,7 +41,7 @@ class KX_RadarSensor : public KX_NearSensor { protected: - Py_Header; + Py_Header float m_coneradius; diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h index d797666d6ab..4c0009a5a4c 100644 --- a/source/gameengine/Ketsji/KX_RaySensor.h +++ b/source/gameengine/Ketsji/KX_RaySensor.h @@ -43,7 +43,7 @@ class KX_RayCast; class KX_RaySensor : public SCA_ISensor { - Py_Header; + Py_Header STR_String m_propertyname; bool m_bFindMaterial; bool m_bXRay; diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h index 4bb84663e9e..ec5cf305c3e 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h @@ -45,7 +45,7 @@ class SCA_IScene; class KX_SCA_AddObjectActuator : public SCA_IActuator { - Py_Header; + Py_Header /// Time field: lifetime of the new object int m_timeProp; diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h index eaad67ad0ea..5fefbb8cca5 100644 --- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h @@ -42,7 +42,7 @@ class KX_SCA_DynamicActuator : public SCA_IActuator { - Py_Header; + Py_Header // dynamics operation to apply to the game object short m_dyn_operation; diff --git a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h index a6bbf258398..7a325257e59 100644 --- a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h @@ -41,7 +41,7 @@ class SCA_IScene; class KX_SCA_EndObjectActuator : public SCA_IActuator { - Py_Header; + Py_Header SCA_IScene* m_scene; public: diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h index 1e0e2155e62..3e07ec2665c 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h @@ -44,7 +44,7 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator { - Py_Header; + Py_Header // mesh reference (mesh to replace) RAS_MeshObject* m_mesh; diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index f1e0fdc8a50..9b8f7f27d80 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -2117,7 +2117,7 @@ PySequenceMethods KX_Scene::Sequence = { PyObject* KX_Scene::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self= static_cast<KX_Scene*>(self_v); - return PyUnicode_FromString(self->GetName().ReadPtr()); + return PyUnicode_From_STR_String(self->GetName()); } PyObject* KX_Scene::pyattr_get_objects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index 67508f5741b..c8070736b7f 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -101,7 +101,7 @@ class KX_ObstacleSimulation; * */ class KX_Scene : public PyObjectPlus, public SCA_IScene { - Py_Header; + Py_Header #ifdef WITH_PYTHON PyObject* m_attr_dict; diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h index 30f325a775e..9064146a1d4 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.h +++ b/source/gameengine/Ketsji/KX_SceneActuator.h @@ -38,7 +38,7 @@ class KX_SceneActuator : public SCA_IActuator { - Py_Header; + Py_Header int m_mode; // (restart) has become a toggle internally... not in the interface though diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h index 174bcc8f990..b9119677f4f 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.h +++ b/source/gameengine/Ketsji/KX_SoundActuator.h @@ -57,7 +57,7 @@ typedef struct KX_3DSoundSettings class KX_SoundActuator : public SCA_IActuator { - Py_Header; + Py_Header bool m_isplaying; AUD_Reference<AUD_IFactory> m_sound; float m_volume; diff --git a/source/gameengine/Ketsji/KX_StateActuator.h b/source/gameengine/Ketsji/KX_StateActuator.h index 3d1dc64d891..aa17b687463 100644 --- a/source/gameengine/Ketsji/KX_StateActuator.h +++ b/source/gameengine/Ketsji/KX_StateActuator.h @@ -44,7 +44,7 @@ */ class KX_StateActuator : public SCA_IActuator { - Py_Header; + Py_Header /** Make visible? */ enum { diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.h b/source/gameengine/Ketsji/KX_SteeringActuator.h index 38be7bce57b..a0ae8e0d1d9 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.h +++ b/source/gameengine/Ketsji/KX_SteeringActuator.h @@ -47,7 +47,7 @@ const int MAX_PATH_LENGTH = 128; class KX_SteeringActuator : public SCA_IActuator { - Py_Header; + Py_Header /** Target object */ KX_GameObject *m_target; diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index a111bf31cf6..1fae766aa13 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -51,7 +51,7 @@ class KX_TouchEventManager; class KX_TouchSensor : public SCA_ISensor { protected: - Py_Header; + Py_Header /** * The sensor should only look for objects with this property. diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h index 9d267bfe89a..30e276c0021 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.h +++ b/source/gameengine/Ketsji/KX_TrackToActuator.h @@ -40,7 +40,7 @@ class KX_TrackToActuator : public SCA_IActuator { - Py_Header; + Py_Header // Object reference. Actually, we use the object's 'life' SCA_IObject* m_object; // 3d toggle diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.h b/source/gameengine/Ketsji/KX_VehicleWrapper.h index f750912c95b..f6e360d34a8 100644 --- a/source/gameengine/Ketsji/KX_VehicleWrapper.h +++ b/source/gameengine/Ketsji/KX_VehicleWrapper.h @@ -16,7 +16,7 @@ class PHY_IMotionState; ///Python interface to physics vehicles (primarily 4-wheel cars and 2wheel bikes) class KX_VehicleWrapper : public PyObjectPlus { - Py_Header; + Py_Header std::vector<PHY_IMotionState*> m_motionStates; diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h index 4ae662faa12..905a4e0f4ab 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.h +++ b/source/gameengine/Ketsji/KX_VertexProxy.h @@ -38,7 +38,7 @@ class KX_VertexProxy : public CValue { - Py_Header; + Py_Header protected: class RAS_TexVert* m_vertex; diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.h b/source/gameengine/Ketsji/KX_VisibilityActuator.h index 0ffe1de6480..f5c45ecbd99 100644 --- a/source/gameengine/Ketsji/KX_VisibilityActuator.h +++ b/source/gameengine/Ketsji/KX_VisibilityActuator.h @@ -37,7 +37,7 @@ class KX_VisibilityActuator : public SCA_IActuator { - Py_Header; + Py_Header /** Make visible? */ bool m_visible; |