style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Sun, 16 Sep 2012 04:58:18 +0000 (04:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 16 Sep 2012 04:58:18 +0000 (04:58 +0000)
222 files changed:
intern/audaspace/Python/AUD_PyAPI.cpp
intern/audaspace/Python/AUD_PyAPI.h
intern/audaspace/intern/AUD_PyInit.h
intern/memutil/MEM_SmartPtr.h
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/idprop.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/sca.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/scanfill.c
source/blender/blenlib/intern/storage.c
source/blender/imbuf/intern/scaling.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ArmatureActuator.cpp
source/gameengine/Converter/BL_ArmatureActuator.h
source/gameengine/Converter/BL_ArmatureChannel.cpp
source/gameengine/Converter/BL_ArmatureChannel.h
source/gameengine/Converter/BL_ArmatureConstraint.cpp
source/gameengine/Converter/BL_ArmatureConstraint.h
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Converter/BL_ArmatureObject.h
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_DeformableGameObject.h
source/gameengine/Converter/BL_MeshDeformer.cpp
source/gameengine/Converter/BL_ModifierDeformer.cpp
source/gameengine/Converter/BL_ModifierDeformer.h
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/BL_ShapeDeformer.h
source/gameengine/Converter/BL_SkinDeformer.cpp
source/gameengine/Converter/BlenderWorldInfo.cpp
source/gameengine/Converter/BlenderWorldInfo.h
source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
source/gameengine/Converter/KX_BlenderScalarInterpolator.h
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Converter/KX_ConvertControllers.cpp
source/gameengine/Converter/KX_ConvertProperties.cpp
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Converter/KX_IpoConvert.cpp
source/gameengine/Expressions/BoolValue.cpp
source/gameengine/Expressions/BoolValue.h
source/gameengine/Expressions/FloatValue.cpp
source/gameengine/Expressions/InputParser.cpp
source/gameengine/Expressions/IntValue.cpp
source/gameengine/Expressions/KX_HashedPtr.h
source/gameengine/Expressions/ListValue.cpp
source/gameengine/Expressions/ListValue.h
source/gameengine/Expressions/Operator2Expr.cpp
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Expressions/StringValue.h
source/gameengine/Expressions/Value.cpp
source/gameengine/Expressions/Value.h
source/gameengine/GameLogic/Joystick/SCA_Joystick.h
source/gameengine/GameLogic/SCA_IController.cpp
source/gameengine/GameLogic/SCA_IInputDevice.cpp
source/gameengine/GameLogic/SCA_IInputDevice.h
source/gameengine/GameLogic/SCA_ILogicBrick.cpp
source/gameengine/GameLogic/SCA_ILogicBrick.h
source/gameengine/GameLogic/SCA_IObject.cpp
source/gameengine/GameLogic/SCA_IObject.h
source/gameengine/GameLogic/SCA_ISensor.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardManager.h
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.h
source/gameengine/GameLogic/SCA_MouseManager.h
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_PropertyActuator.cpp
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GameLogic/SCA_PythonController.h
source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
source/gameengine/GameLogic/SCA_PythonKeyboard.h
source/gameengine/GameLogic/SCA_PythonMouse.cpp
source/gameengine/GameLogic/SCA_PythonMouse.h
source/gameengine/GameLogic/SCA_RandomActuator.cpp
source/gameengine/GameLogic/SCA_RandomActuator.h
source/gameengine/GameLogic/SCA_RandomSensor.cpp
source/gameengine/GameLogic/SCA_TimeEventManager.cpp
source/gameengine/GamePlayer/common/GPC_Canvas.cpp
source/gameengine/GamePlayer/common/GPC_Canvas.h
source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp
source/gameengine/GamePlayer/common/GPC_RawImage.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
source/gameengine/GamePlayer/common/bmfont.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/BL_Shader.cpp
source/gameengine/Ketsji/BL_Shader.h
source/gameengine/Ketsji/BL_Texture.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
source/gameengine/Ketsji/KX_ArmatureSensor.cpp
source/gameengine/Ketsji/KX_ArmatureSensor.h
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_Camera.h
source/gameengine/Ketsji/KX_CameraActuator.cpp
source/gameengine/Ketsji/KX_CameraIpoSGController.h
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
source/gameengine/Ketsji/KX_ConstraintActuator.h
source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
source/gameengine/Ketsji/KX_ConstraintWrapper.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_Dome.cpp
source/gameengine/Ketsji/KX_FontObject.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_IInterpolator.h
source/gameengine/Ketsji/KX_IScalarInterpolator.h
source/gameengine/Ketsji/KX_IpoActuator.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_Light.cpp
source/gameengine/Ketsji/KX_Light.h
source/gameengine/Ketsji/KX_LightIpoSGController.h
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_MeshProxy.h
source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
source/gameengine/Ketsji/KX_NavMeshObject.cpp
source/gameengine/Ketsji/KX_ObjectActuator.cpp
source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
source/gameengine/Ketsji/KX_ObstacleSimulation.h
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_ParentActuator.h
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Ketsji/KX_PolyProxy.h
source/gameengine/Ketsji/KX_PolygonMaterial.cpp
source/gameengine/Ketsji/KX_PolygonMaterial.h
source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
source/gameengine/Ketsji/KX_PyMath.cpp
source/gameengine/Ketsji/KX_PyMath.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_PythonInit.h
source/gameengine/Ketsji/KX_PythonInitTypes.h
source/gameengine/Ketsji/KX_PythonSeq.cpp
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RaySensor.cpp
source/gameengine/Ketsji/KX_RaySensor.h
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
source/gameengine/Ketsji/KX_SG_NodeRelationships.h
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_SceneActuator.cpp
source/gameengine/Ketsji/KX_SceneActuator.h
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/Ketsji/KX_SoundActuator.h
source/gameengine/Ketsji/KX_SteeringActuator.cpp
source/gameengine/Ketsji/KX_SteeringActuator.h
source/gameengine/Ketsji/KX_TouchSensor.cpp
source/gameengine/Ketsji/KX_TouchSensor.h
source/gameengine/Ketsji/KX_TrackToActuator.cpp
source/gameengine/Ketsji/KX_TrackToActuator.h
source/gameengine/Ketsji/KX_VehicleWrapper.cpp
source/gameengine/Ketsji/KX_VertexProxy.cpp
source/gameengine/Ketsji/KX_VertexProxy.h
source/gameengine/Ketsji/KX_WorldIpoController.h
source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
source/gameengine/Network/NG_NetworkScene.h
source/gameengine/Physics/Bullet/CcdGraphicController.h
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
source/gameengine/Physics/common/PHY_DynamicTypes.h
source/gameengine/Physics/common/PHY_IController.h
source/gameengine/Physics/common/PHY_IMotionState.h
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_BucketManager.cpp
source/gameengine/Rasterizer/RAS_Deformer.h
source/gameengine/Rasterizer/RAS_FramingManager.cpp
source/gameengine/Rasterizer/RAS_FramingManager.h
source/gameengine/Rasterizer/RAS_IRasterizer.h
source/gameengine/Rasterizer/RAS_IRenderTools.h
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
source/gameengine/SceneGraph/SG_Controller.h
source/gameengine/SceneGraph/SG_IObject.cpp
source/gameengine/SceneGraph/SG_IObject.h
source/gameengine/SceneGraph/SG_Node.cpp
source/gameengine/SceneGraph/SG_Node.h
source/gameengine/SceneGraph/SG_ParentRelation.h
source/gameengine/SceneGraph/SG_Spatial.cpp
source/gameengine/SceneGraph/SG_Spatial.h
source/gameengine/VideoTexture/BlendType.h
source/gameengine/VideoTexture/FilterBase.cpp
source/gameengine/VideoTexture/FilterBase.h
source/gameengine/VideoTexture/FilterBlueScreen.cpp
source/gameengine/VideoTexture/FilterColor.cpp
source/gameengine/VideoTexture/FilterNormal.cpp
source/gameengine/VideoTexture/ImageBase.cpp
source/gameengine/VideoTexture/ImageBase.h
source/gameengine/VideoTexture/ImageBuff.cpp
source/gameengine/VideoTexture/ImageMix.cpp
source/gameengine/VideoTexture/ImageRender.cpp
source/gameengine/VideoTexture/ImageViewport.cpp
source/gameengine/VideoTexture/ImageViewport.h
source/gameengine/VideoTexture/PyTypeList.cpp
source/gameengine/VideoTexture/PyTypeList.h
source/gameengine/VideoTexture/Texture.cpp
source/gameengine/VideoTexture/Texture.h
source/gameengine/VideoTexture/VideoBase.cpp
source/gameengine/VideoTexture/VideoBase.h
source/gameengine/VideoTexture/VideoFFmpeg.cpp
source/gameengine/VideoTexture/VideoFFmpeg.h
source/gameengine/VideoTexture/blendVideoTex.cpp

index 238249b..dd58e5a 100644 (file)
@@ -80,7 +80,7 @@ typedef enum
 
 // ====================================================================
 
-static PyObjectAUDError;
+static PyObject *AUDError;
 
 static const char* device_not_3d_error = "Device is not a 3D device!";
 
@@ -92,7 +92,7 @@ Factory_dealloc(Factory* self)
        if(self->factory)
                delete reinterpret_cast<AUD_Reference<AUD_IFactory>*>(self->factory);
        Py_XDECREF(self->child_list);
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 static PyObject *
@@ -139,7 +139,7 @@ PyDoc_STRVAR(M_aud_Factory_sine_doc,
                         ":rtype: :class:`Factory`");
 
 static PyObject *
-Factory_sine(PyTypeObject* type, PyObjectargs)
+Factory_sine(PyTypeObject* type, PyObject *args)
 {
        float frequency;
        double rate = 44100;
@@ -179,7 +179,7 @@ PyDoc_STRVAR(M_aud_Factory_file_doc,
                         "playback of that factory.");
 
 static PyObject *
-Factory_file(PyTypeObject* type, PyObjectargs)
+Factory_file(PyTypeObject* type, PyObject *args)
 {
        const char* filename = NULL;
 
@@ -218,7 +218,7 @@ PyDoc_STRVAR(M_aud_Factory_lowpass_doc,
                         ":rtype: :class:`Factory`");
 
 static PyObject *
-Factory_lowpass(Factory* self, PyObjectargs)
+Factory_lowpass(Factory* self, PyObject *args)
 {
        float frequency;
        float Q = 0.5;
@@ -232,7 +232,7 @@ Factory_lowpass(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -260,7 +260,7 @@ PyDoc_STRVAR(M_aud_Factory_delay_doc,
                         ":rtype: :class:`Factory`");
 
 static PyObject *
-Factory_delay(Factory* self, PyObjectargs)
+Factory_delay(Factory* self, PyObject *args)
 {
        float delay;
 
@@ -273,7 +273,7 @@ Factory_delay(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -301,7 +301,7 @@ PyDoc_STRVAR(M_aud_Factory_join_doc,
                         "(channels and samplerate).");
 
 static PyObject *
-Factory_join(Factory* self, PyObjectobject)
+Factory_join(Factory* self, PyObject *object)
 {
        PyTypeObject* type = Py_TYPE(self);
 
@@ -346,7 +346,7 @@ PyDoc_STRVAR(M_aud_Factory_highpass_doc,
                         ":rtype: :class:`Factory`");
 
 static PyObject *
-Factory_highpass(Factory* self, PyObjectargs)
+Factory_highpass(Factory* self, PyObject *args)
 {
        float frequency;
        float Q = 0.5;
@@ -360,7 +360,7 @@ Factory_highpass(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -388,7 +388,7 @@ PyDoc_STRVAR(M_aud_Factory_limit_doc,
                         ":rtype: :class:`Factory`");
 
 static PyObject *
-Factory_limit(Factory* self, PyObjectargs)
+Factory_limit(Factory* self, PyObject *args)
 {
        float start, end;
 
@@ -401,7 +401,7 @@ Factory_limit(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -432,7 +432,7 @@ PyDoc_STRVAR(M_aud_Factory_pitch_doc,
                         ":attr:`Handle.pitch` instead.");
 
 static PyObject *
-Factory_pitch(Factory* self, PyObjectargs)
+Factory_pitch(Factory* self, PyObject *args)
 {
        float factor;
 
@@ -445,7 +445,7 @@ Factory_pitch(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -474,7 +474,7 @@ PyDoc_STRVAR(M_aud_Factory_volume_doc,
                         ":attr:`Handle.volume` instead.");
 
 static PyObject *
-Factory_volume(Factory* self, PyObjectargs)
+Factory_volume(Factory* self, PyObject *args)
 {
        float volume;
 
@@ -487,7 +487,7 @@ Factory_volume(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -517,7 +517,7 @@ PyDoc_STRVAR(M_aud_Factory_fadein_doc,
                         ".. note:: Before the fade starts it plays silence.");
 
 static PyObject *
-Factory_fadein(Factory* self, PyObjectargs)
+Factory_fadein(Factory* self, PyObject *args)
 {
        float start, length;
 
@@ -530,7 +530,7 @@ Factory_fadein(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -561,7 +561,7 @@ PyDoc_STRVAR(M_aud_Factory_fadeout_doc,
                         "the length of the factory is not altered.");
 
 static PyObject *
-Factory_fadeout(Factory* self, PyObjectargs)
+Factory_fadeout(Factory* self, PyObject *args)
 {
        float start, length;
 
@@ -574,7 +574,7 @@ Factory_fadeout(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -603,7 +603,7 @@ PyDoc_STRVAR(M_aud_Factory_loop_doc,
                         ":attr:`Handle.loop_count` instead.");
 
 static PyObject *
-Factory_loop(Factory* self, PyObjectargs)
+Factory_loop(Factory* self, PyObject *args)
 {
        int loop;
 
@@ -616,7 +616,7 @@ Factory_loop(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -644,7 +644,7 @@ PyDoc_STRVAR(M_aud_Factory_mix_doc,
                         "(channels and samplerate).");
 
 static PyObject *
-Factory_mix(Factory* self, PyObjectobject)
+Factory_mix(Factory* self, PyObject *object)
 {
        PyTypeObject* type = Py_TYPE(self);
 
@@ -692,7 +692,7 @@ Factory_pingpong(Factory* self)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -731,7 +731,7 @@ Factory_reverse(Factory* self)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -795,7 +795,7 @@ PyDoc_STRVAR(M_aud_Factory_square_doc,
                         ":rtype: :class:`Factory`");
 
 static PyObject *
-Factory_square(Factory* self, PyObjectargs)
+Factory_square(Factory* self, PyObject *args)
 {
        float threshold = 0;
 
@@ -808,7 +808,7 @@ Factory_square(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -842,10 +842,10 @@ PyDoc_STRVAR(M_aud_Factory_filter_doc,
                         ":rtype: :class:`Factory`");
 
 static PyObject *
-Factory_filter(Factory* self, PyObjectargs)
+Factory_filter(Factory* self, PyObject *args)
 {
-       PyObjectpy_b;
-       PyObjectpy_a = NULL;
+       PyObject *py_b;
+       PyObject *py_a = NULL;
        Py_ssize_t py_a_len;
        Py_ssize_t py_b_len;
 
@@ -868,7 +868,7 @@ Factory_filter(Factory* self, PyObject* args)
        }
 
        std::vector<float> a, b;
-       PyObjectpy_value;
+       PyObject *py_value;
        float value;
 
        for(Py_ssize_t i = 0; i < py_b_len; i++)
@@ -911,7 +911,7 @@ Factory_filter(Factory* self, PyObject* args)
        if(parent != NULL)
        {
                Py_INCREF(self);
-               parent->child_list = (PyObject*)self;
+               parent->child_list = (PyObject *)self;
 
                try
                {
@@ -1040,7 +1040,7 @@ Handle_dealloc(Handle* self)
 {
        if(self->handle)
                delete reinterpret_cast<AUD_Reference<AUD_IHandle>*>(self->handle);
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 PyDoc_STRVAR(M_aud_Handle_pause_doc,
@@ -1135,7 +1135,7 @@ Handle_get_position(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_position(Handle *self, PyObjectargs, void* nothing)
+Handle_set_position(Handle *self, PyObject *args, void* nothing)
 {
        float position;
 
@@ -1180,7 +1180,7 @@ Handle_get_keep(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_keep(Handle *self, PyObjectargs, void* nothing)
+Handle_set_keep(Handle *self, PyObject *args, void* nothing)
 {
        if(!PyBool_Check(args))
        {
@@ -1239,7 +1239,7 @@ Handle_get_volume(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_volume(Handle *self, PyObjectargs, void* nothing)
+Handle_set_volume(Handle *self, PyObject *args, void* nothing)
 {
        float volume;
 
@@ -1278,7 +1278,7 @@ Handle_get_pitch(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_pitch(Handle *self, PyObjectargs, void* nothing)
+Handle_set_pitch(Handle *self, PyObject *args, void* nothing)
 {
        float pitch;
 
@@ -1317,7 +1317,7 @@ Handle_get_loop_count(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_loop_count(Handle *self, PyObjectargs, void* nothing)
+Handle_set_loop_count(Handle *self, PyObject *args, void* nothing)
 {
        int loops;
 
@@ -1366,7 +1366,7 @@ Handle_get_location(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_location(Handle *self, PyObjectargs, void* nothing)
+Handle_set_location(Handle *self, PyObject *args, void* nothing)
 {
        float x, y, z;
 
@@ -1422,7 +1422,7 @@ Handle_get_velocity(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_velocity(Handle *self, PyObjectargs, void* nothing)
+Handle_set_velocity(Handle *self, PyObject *args, void* nothing)
 {
        float x, y, z;
 
@@ -1478,7 +1478,7 @@ Handle_get_orientation(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_orientation(Handle *self, PyObjectargs, void* nothing)
+Handle_set_orientation(Handle *self, PyObject *args, void* nothing)
 {
        float w, x, y, z;
 
@@ -1533,7 +1533,7 @@ Handle_get_relative(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_relative(Handle *self, PyObjectargs, void* nothing)
+Handle_set_relative(Handle *self, PyObject *args, void* nothing)
 {
        if(!PyBool_Check(args))
        {
@@ -1591,7 +1591,7 @@ Handle_get_volume_minimum(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_volume_minimum(Handle *self, PyObjectargs, void* nothing)
+Handle_set_volume_minimum(Handle *self, PyObject *args, void* nothing)
 {
        float volume;
 
@@ -1646,7 +1646,7 @@ Handle_get_volume_maximum(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_volume_maximum(Handle *self, PyObjectargs, void* nothing)
+Handle_set_volume_maximum(Handle *self, PyObject *args, void* nothing)
 {
        float volume;
 
@@ -1702,7 +1702,7 @@ Handle_get_distance_reference(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_distance_reference(Handle *self, PyObjectargs, void* nothing)
+Handle_set_distance_reference(Handle *self, PyObject *args, void* nothing)
 {
        float distance;
 
@@ -1758,7 +1758,7 @@ Handle_get_distance_maximum(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_distance_maximum(Handle *self, PyObjectargs, void* nothing)
+Handle_set_distance_maximum(Handle *self, PyObject *args, void* nothing)
 {
        float distance;
 
@@ -1814,7 +1814,7 @@ Handle_get_attenuation(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_attenuation(Handle *self, PyObjectargs, void* nothing)
+Handle_set_attenuation(Handle *self, PyObject *args, void* nothing)
 {
        float factor;
 
@@ -1875,7 +1875,7 @@ Handle_get_cone_angle_inner(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_cone_angle_inner(Handle *self, PyObjectargs, void* nothing)
+Handle_set_cone_angle_inner(Handle *self, PyObject *args, void* nothing)
 {
        float angle;
 
@@ -1930,7 +1930,7 @@ Handle_get_cone_angle_outer(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_cone_angle_outer(Handle *self, PyObjectargs, void* nothing)
+Handle_set_cone_angle_outer(Handle *self, PyObject *args, void* nothing)
 {
        float angle;
 
@@ -1985,7 +1985,7 @@ Handle_get_cone_volume_outer(Handle *self, void* nothing)
 }
 
 static int
-Handle_set_cone_volume_outer(Handle *self, PyObjectargs, void* nothing)
+Handle_set_cone_volume_outer(Handle *self, PyObject *args, void* nothing)
 {
        float volume;
 
@@ -2105,7 +2105,7 @@ Device_dealloc(Device* self)
 {
        if(self->device)
                delete reinterpret_cast<AUD_Reference<AUD_IDevice>*>(self->device);
-       Py_TYPE(self)->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 static PyObject *
@@ -2201,8 +2201,8 @@ PyDoc_STRVAR(M_aud_Device_play_doc,
 static PyObject *
 Device_play(Device *self, PyObject *args, PyObject *kwds)
 {
-       PyObjectobject;
-       PyObjectkeepo = NULL;
+       PyObject *object;
+       PyObject *keepo = NULL;
 
        bool keep = false;
 
@@ -2402,7 +2402,7 @@ Device_get_volume(Device *self, void* nothing)
 }
 
 static int
-Device_set_volume(Device *self, PyObjectargs, void* nothing)
+Device_set_volume(Device *self, PyObject *args, void* nothing)
 {
        float volume;
 
@@ -2449,7 +2449,7 @@ Device_get_listener_location(Device *self, void* nothing)
 }
 
 static int
-Device_set_listener_location(Device *self, PyObjectargs, void* nothing)
+Device_set_listener_location(Device *self, PyObject *args, void* nothing)
 {
        float x, y, z;
 
@@ -2504,7 +2504,7 @@ Device_get_listener_velocity(Device *self, void* nothing)
 }
 
 static int
-Device_set_listener_velocity(Device *self, PyObjectargs, void* nothing)
+Device_set_listener_velocity(Device *self, PyObject *args, void* nothing)
 {
        float x, y, z;
 
@@ -2559,7 +2559,7 @@ Device_get_listener_orientation(Device *self, void* nothing)
 }
 
 static int
-Device_set_listener_orientation(Device *self, PyObjectargs, void* nothing)
+Device_set_listener_orientation(Device *self, PyObject *args, void* nothing)
 {
        float w, x, y, z;
 
@@ -2614,7 +2614,7 @@ Device_get_speed_of_sound(Device *self, void* nothing)
 }
 
 static int
-Device_set_speed_of_sound(Device *self, PyObjectargs, void* nothing)
+Device_set_speed_of_sound(Device *self, PyObject *args, void* nothing)
 {
        float speed;
 
@@ -2670,7 +2670,7 @@ Device_get_doppler_factor(Device *self, void* nothing)
 }
 
 static int
-Device_set_doppler_factor(Device *self, PyObjectargs, void* nothing)
+Device_set_doppler_factor(Device *self, PyObject *args, void* nothing)
 {
        float factor;
 
@@ -2724,7 +2724,7 @@ Device_get_distance_model(Device *self, void* nothing)
 }
 
 static int
-Device_set_distance_model(Device *self, PyObjectargs, void* nothing)
+Device_set_distance_model(Device *self, PyObject *args, void* nothing)
 {
        int model;
 
@@ -2833,7 +2833,7 @@ Factory_empty()
 }
 
 Factory*
-checkFactory(PyObjectfactory)
+checkFactory(PyObject *factory)
 {
        if(!PyObject_TypeCheck(factory, &FactoryType))
        {
@@ -2862,7 +2862,7 @@ static struct PyModuleDef audmodule = {
 PyMODINIT_FUNC
 PyInit_aud(void)
 {
-       PyObjectm;
+       PyObject *m;
 
        if(PyType_Ready(&FactoryType) < 0)
                return NULL;
@@ -2878,13 +2878,13 @@ PyInit_aud(void)
                return NULL;
 
        Py_INCREF(&FactoryType);
-       PyModule_AddObject(m, "Factory", (PyObject*)&FactoryType);
+       PyModule_AddObject(m, "Factory", (PyObject *)&FactoryType);
 
        Py_INCREF(&DeviceType);
-       PyModule_AddObject(m, "Device", (PyObject*)&DeviceType);
+       PyModule_AddObject(m, "Device", (PyObject *)&DeviceType);
 
        Py_INCREF(&HandleType);
-       PyModule_AddObject(m, "Handle", (PyObject*)&HandleType);
+       PyModule_AddObject(m, "Handle", (PyObject *)&HandleType);
 
        AUDError = PyErr_NewException("aud.error", NULL, NULL);
        Py_INCREF(AUDError);
index 7a7e87e..0183a2d 100644 (file)
@@ -46,7 +46,7 @@ typedef void AUD_Reference_AUD_IHandle;
 
 typedef struct {
        PyObject_HEAD
-       PyObjectchild_list;
+       PyObject *child_list;
        AUD_Reference_AUD_IFactory* factory;
 } Factory;
 
@@ -63,9 +63,9 @@ typedef struct {
 PyMODINIT_FUNC
 PyInit_aud(void);
 
-extern PyObjectDevice_empty();
-extern PyObjectFactory_empty();
-extern Factory* checkFactory(PyObject* factory);
+extern PyObject *Device_empty();
+extern PyObject *Factory_empty();
+extern Factory  *checkFactory(PyObject *factory);
 
 #ifdef __cplusplus
 }
index 8c045e6..95a60cd 100644 (file)
@@ -40,7 +40,7 @@ extern "C" {
 /**
  * Initalizes the Python module.
  */
-extern PyObjectAUD_initPython(void);
+extern PyObject *AUD_initPython(void);
 
 #ifdef __cplusplus
 }
index 722a0a8..09cf5c9 100644 (file)
@@ -86,7 +86,7 @@
  *     private :
  *             MEM_SmartPtr<foo> m_foo;
  *     }
- *                     
+ *
  * You may also safely construct vectors of MEM_SmartPtrs and 
  * have the vector own stuff you put into it. 
  *
@@ -167,7 +167,7 @@ public :
        Ref(
        ) const {
                return *m_val;
-       }       
+       }
 
        /** 
         * Assignment operator - ownership is transfered from rhs to lhs. 
@@ -207,7 +207,7 @@ public :
        Release(
        ) const {
                T* temp = m_val;
-               (const_cast<MEM_SmartPtr *>(this))->m_val = NULL;       
+               (const_cast<MEM_SmartPtr *>(this))->m_val = NULL;
                return temp;
        }
 
index 8a49cba..d8c3e26 100644 (file)
@@ -65,7 +65,7 @@ static void icon_free(void *val)
        Icon *icon = val;
 
        if (icon) {
-               if (icon->drawinfo_free) {              
+               if (icon->drawinfo_free) {
                        icon->drawinfo_free(icon->drawinfo);
                }
                else if (icon->drawinfo) {
@@ -255,7 +255,7 @@ void BKE_icon_changed(int id)
                                prv->changed_timestamp[i]++;
                        }
                }
-       }       
+       }
 }
 
 int BKE_icon_getid(struct ID *id)
index 8229df2..8ceaab5 100644 (file)
@@ -484,7 +484,7 @@ void IDP_ReplaceInGroup(IDProperty *group, IDProperty *prop)
                
                BLI_remlink(&group->data.group, loop);
                IDP_FreeProperty(loop);
-               MEM_freeN(loop);                        
+               MEM_freeN(loop);
        }
        else {
                group->len++;
@@ -679,7 +679,7 @@ IDProperty *IDP_New(const int type, const IDPropertyTemplate *val, const char *n
                case IDP_DOUBLE:
                        prop = MEM_callocN(sizeof(IDProperty), "IDProperty float");
                        *(double *)&prop->data.val = val->d;
-                       break;          
+                       break;
                case IDP_ARRAY:
                {
                        /* for now, we only support float and int and double arrays */
index 3925c3c..4679d85 100644 (file)
@@ -186,7 +186,7 @@ void BKE_mball_unlink(MetaBall *mb)
 /* do not free mball itself */
 void BKE_mball_free(MetaBall *mb)
 {
-       BKE_mball_unlink(mb);   
+       BKE_mball_unlink(mb);
        
        if (mb->adt) {
                BKE_free_animdata((ID *)mb);
@@ -562,7 +562,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis)
                                                        basis = ob;
                                                        basisnr = obnr;
                                                }
-                                       }       
+                                       }
                                }
                        }
                        
@@ -732,7 +732,7 @@ static octal_node *find_metaball_octal_node(octal_node *node, float x, float y,
                                        return find_metaball_octal_node(node->nodes[2], x, y, z, depth--);
                                else
                                        return node;
-                       }               
+                       }
                }
        }
        else {
@@ -762,7 +762,7 @@ static octal_node *find_metaball_octal_node(octal_node *node, float x, float y,
                                        return find_metaball_octal_node(node->nodes[6], x, y, z, depth--);
                                else
                                        return node;
-                       }               
+                       }
                }
        }
        
@@ -861,7 +861,7 @@ static void *new_pgn_element(int size)
                }
                BLI_freelistN(&lb);
                
-               return NULL;    
+               return NULL;
        }
        
        size = 4 * ( (size + 3) / 4);
@@ -1628,7 +1628,7 @@ static void polygonize(PROCESS *mbproc, MetaBall *mb)
        for (a = 0; a < G_mb.totelem; a++) {
 
                /* try to find 8 points on the surface for each MetaElem */
-               find_first_points(mbproc, mb, a);       
+               find_first_points(mbproc, mb, a);
        }
 
        /* polygonize all MetaElems of current MetaBall */
@@ -2038,7 +2038,7 @@ static void subdivide_metaball_octal_node(octal_node *node, float size_x, float
                                                
                                        }
                        
-                                       /* ml belongs to the (4)5th node too */ 
+                                       /* ml belongs to the (4)5th node too */
                                        if (ml->bb->vec[6][2] >= z) {
                                                fill_metaball_octal_node(node, ml, 4);
                                        }
@@ -2226,7 +2226,7 @@ static void init_metaball_octal_tree(int depth)
                }
        }
 
-       /* size of first node */        
+       /* size of first node */
        size[0] = node->x_max - node->x_min;
        size[1] = node->y_max - node->y_min;
        size[2] = node->z_max - node->z_min;
index 7d9d2f0..be2f187 100644 (file)
@@ -210,7 +210,7 @@ void unlink_controllers(ListBase *lb)
        bController *cont;
        
        for (cont= lb->first; cont; cont= cont->next)
-               unlink_controller(cont);        
+               unlink_controller(cont);
 }
 
 void free_controller(bController *cont)
@@ -536,7 +536,7 @@ void clear_sca_new_poins(void)
        ob= G.main->object.first;
        while (ob) {
                clear_sca_new_poins_ob(ob);
-               ob= ob->id.next;        
+               ob= ob->id.next;
        }
 }
 
@@ -624,7 +624,7 @@ void set_sca_new_poins(void)
        ob= G.main->object.first;
        while (ob) {
                set_sca_new_poins_ob(ob);
-               ob= ob->id.next;        
+               ob= ob->id.next;
        }
 }
 
@@ -696,7 +696,7 @@ void sca_remove_ob_poin(Object *obt, Object *ob)
                        if (sta->target == ob) sta->target = NULL;
                }
                act= act->next;
-       }       
+       }
 }
 
 /* ******************** INTERFACE ******************* */
index a7a6671..cc482e2 100644 (file)
@@ -1368,7 +1368,7 @@ int BLI_testextensie(const char *str, const char *ext)
                retval = 0;
        }
        else if (BLI_strcasecmp(ext, str + a - b)) {
-               retval = 0;     
+               retval = 0;
        }
        else {
                retval = 1;
index 32afaba..7ae27b8 100644 (file)
@@ -211,7 +211,7 @@ ScanFillVert *BLI_scanfill_vert_add(ScanFillContext *sf_ctx, const float vec[3])
        
        copy_v3_v3(eve->co, vec);
 
-       return eve;     
+       return eve;
 }
 
 ScanFillEdge *BLI_scanfill_edge_add(ScanFillContext *sf_ctx, ScanFillVert *v1, ScanFillVert *v2)
@@ -521,7 +521,7 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
        while (eve) {
                printf("vert: %x co: %f %f\n", eve, eve->xy[0], eve->xy[1]);
                eve = eve->next;
-       }       
+       }
        eed = sf_ctx->filledgebase.first;
        while (eed) {
                printf("edge: %x  verts: %x %x\n", eed, eed->v1, eed->v2);
index 0fccd91..0d3f6ae 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <stdlib.h>    
+#include <stdlib.h>
 
 #ifndef WIN32
 #include <dirent.h>
index 389c3c4..527f334 100644 (file)
@@ -1051,7 +1051,7 @@ static ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
                        
                        sample -= 1.0f;
                }
-       }       
+       }
 
        if (do_rect) {
                // printf("%ld %ld\n", (uchar *)rect - ((uchar *)ibuf->rect), rect_size);
index 62bfc31..5cfa97e 100644 (file)
@@ -552,7 +552,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                                                ketsjinextframestate.draw_letterbox = draw_letterbox;
                        
                                                pynextframestate.state = &ketsjinextframestate;
-                                               pynextframestate.func = &BL_KetsjiPyNextFrame;                  
+                                               pynextframestate.func = &BL_KetsjiPyNextFrame;
                                                printf("Yielding control to Python script '%s'...\n", python_main);
                                                PyRun_SimpleString(python_code);
                                                printf("Exit Python script '%s'\n", python_main);
@@ -590,7 +590,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                                const Py_ssize_t numitems= PyList_GET_SIZE(gameLogic_keys_new);
                                Py_ssize_t listIndex;
                                for (listIndex=0; listIndex < numitems; listIndex++) {
-                                       PyObjectitem = PyList_GET_ITEM(gameLogic_keys_new, listIndex);
+                                       PyObject *item = PyList_GET_ITEM(gameLogic_keys_new, listIndex);
                                        if (!PySequence_Contains(gameLogic_keys, item)) {
                                                PyDict_DelItem( PyModule_GetDict(gameLogic), item);
                                        }
index 6236923..4f450bc 100644 (file)
@@ -53,7 +53,7 @@ KX_BlenderCanvas::~KX_BlenderCanvas()
 void KX_BlenderCanvas::Init()
 {
        glDepthFunc(GL_LEQUAL);
-}      
+}
 
 
 void KX_BlenderCanvas::SwapBuffers()
@@ -143,7 +143,7 @@ KX_BlenderCanvas::
 GetWindowArea(
 ) {
        return m_area_rect;
-}      
+}
 
        void
 KX_BlenderCanvas::
index 98a1aa8..7c4c759 100644 (file)
@@ -153,7 +153,7 @@ void BL_print_game_line(int fontid, const char* text, int size, int dpi, float*
 }
 
 void BL_print_gamedebug_line(const char* text, int xco, int yco, int width, int height)
-{      
+{
        /* gl prepping */
        DisableForText();
        glDisable(GL_DEPTH_TEST);
index c4daecc..85b76d7 100644 (file)
@@ -344,7 +344,7 @@ void KX_BlenderRenderTools::PopMatrix()
 
 int KX_BlenderRenderTools::applyLights(int objectlayer, const MT_Transform& viewmat)
 {
-       // taken from blender source, incompatibility between Blender Object / GameObject       
+       // taken from blender source, incompatibility between Blender Object / GameObject
        KX_Scene* kxscene = (KX_Scene*)m_auxilaryClientInfo;
        float glviewmat[16];
        unsigned int count;
index a229c9f..54ff4dd 100644 (file)
@@ -62,7 +62,7 @@ class KX_BlenderRenderTools  : public RAS_IRenderTools
 
 public:
                                                KX_BlenderRenderTools();
-       virtual                         ~KX_BlenderRenderTools();       
+       virtual                         ~KX_BlenderRenderTools();
 
        void                            EndFrame(RAS_IRasterizer* rasty);
        void                            BeginFrame(RAS_IRasterizer* rasty);
index 92d0411..fcf0958 100644 (file)
@@ -96,7 +96,7 @@ BL_ActionActuator::BL_ActionActuator(SCA_IObject* gameobj,
        m_userpose(NULL),
        m_action(action),
        m_propname(propname),
-       m_framepropname(framepropname)          
+       m_framepropname(framepropname)
 {
        if (!end_reset)
                m_flag |= ACT_FLAG_CONTINUE;
@@ -299,7 +299,7 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
                m_flag |= ACT_FLAG_ATTEMPT_PLAY;
        }
        else if ((m_flag & ACT_FLAG_ACTIVE) && bNegativeEvent)
-       {       
+       {
                m_flag &= ~ACT_FLAG_ATTEMPT_PLAY;
                m_localtime = obj->GetActionFrame(m_layer);
                bAction *curr_action = obj->GetCurrentAction(m_layer);
@@ -347,7 +347,7 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 /* Python functions                                                          */
 /* ------------------------------------------------------------------------- */
 
-PyObject* BL_ActionActuator::PyGetChannel(PyObject* value)
+PyObject *BL_ActionActuator::PyGetChannel(PyObject *value)
 {
        PyErr_SetString(PyExc_NotImplementedError, "BL_ActionActuator.getChannel() no longer works, please use BL_ArmatureObject.channels instead");
        return NULL;
@@ -555,7 +555,7 @@ PyAttributeDef BL_ActionActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectBL_ActionActuator::pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ActionActuator::pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ActionActuator* self= static_cast<BL_ActionActuator*>(self_v);
        return PyUnicode_FromString(self->GetAction() ? self->GetAction()->id.name+2 : "");
@@ -589,7 +589,7 @@ int BL_ActionActuator::pyattr_set_action(void *self_v, const KX_PYATTRIBUTE_DEF
 
 }
 
-PyObjectBL_ActionActuator::pyattr_get_channel_names(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ActionActuator::pyattr_get_channel_names(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        PyErr_SetString(PyExc_NotImplementedError, "BL_ActionActuator.channelNames no longer works, please use BL_ArmatureObject.channels instead");
        return NULL;
@@ -620,7 +620,7 @@ PyObject* BL_ActionActuator::pyattr_get_channel_names(void *self_v, const KX_PYA
 #endif
 }
 
-PyObjectBL_ActionActuator::pyattr_get_use_continue(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ActionActuator::pyattr_get_use_continue(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ActionActuator* self= static_cast<BL_ActionActuator*>(self_v);
        return PyBool_FromLong(self->m_flag & ACT_FLAG_CONTINUE);
@@ -638,7 +638,7 @@ int BL_ActionActuator::pyattr_set_use_continue(void *self_v, const KX_PYATTRIBUT
        return PY_SET_ATTR_SUCCESS;
 }
 
-PyObjectBL_ActionActuator::pyattr_get_frame(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ActionActuator::pyattr_get_frame(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ActionActuator* self= static_cast<BL_ActionActuator*>(self_v);
        return PyFloat_FromDouble(((KX_GameObject*)self->m_gameobj)->GetActionFrame(self->m_layer));
index 3f4a261..f0c4b3d 100644 (file)
@@ -146,7 +146,7 @@ void BL_ArmatureActuator::FindConstraint()
 bool BL_ArmatureActuator::Update(double curtime, bool frame)
 {
        // the only role of this actuator is to ensure that the armature pose will be evaluated
-       bool result = false;    
+       bool result = false;
        bool bNegativeEvent = IsNegativeEvent();
        RemoveAllEvents();
 
@@ -227,11 +227,11 @@ PyAttributeDef BL_ArmatureActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectBL_ArmatureActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ArmatureActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ArmatureActuator* actuator = static_cast<BL_ArmatureActuator*>(self);
        KX_GameObject *target = (!strcmp(attrdef->m_name, "target")) ? actuator->m_gametarget : actuator->m_gamesubtarget;
-       if (!target)    
+       if (!target)
                Py_RETURN_NONE;
        else
                return target->GetProxy();
@@ -247,7 +247,7 @@ int BL_ArmatureActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBU
                return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error
                
        if (target != NULL)
-               target->UnregisterActuator(actuator);   
+               target->UnregisterActuator(actuator);
 
        target = gameobj;
                
@@ -257,11 +257,11 @@ int BL_ArmatureActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBU
        return PY_SET_ATTR_SUCCESS;
 }
 
-PyObjectBL_ArmatureActuator::pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ArmatureActuator::pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ArmatureActuator* actuator = static_cast<BL_ArmatureActuator*>(self);
        BL_ArmatureConstraint* constraint = actuator->m_constraint;
-       if (!constraint)        
+       if (!constraint)
                Py_RETURN_NONE;
        else
                return constraint->GetProxy();
index 638640c..0c88dcc 100644 (file)
@@ -73,8 +73,8 @@ public:
 #ifdef WITH_PYTHON
 
        /* These are used to get and set m_target */
-       static PyObjectpyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
-       static PyObjectpyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
 #endif // WITH_PYTHON
index 7344aa9..e588d1d 100644 (file)
@@ -62,7 +62,7 @@ PyTypeObject BL_ArmatureChannel::Type = {
        py_base_new
 };
 
-PyObjectBL_ArmatureChannel::py_repr(void)
+PyObject *BL_ArmatureChannel::py_repr(void)
 {
        return PyUnicode_FromString(m_posechannel->name);
 }
@@ -104,8 +104,8 @@ PyMethodDef BL_ArmatureChannel::Methods[] = {
 
 PyAttributeDef BL_ArmatureChannel::Attributes[] = {
        // Keep these attributes in order of BCA_ defines!!! used by py_attr_getattr and py_attr_setattr
-       KX_PYATTRIBUTE_RO_FUNCTION("bone",BL_ArmatureChannel,py_attr_getattr),  
-       KX_PYATTRIBUTE_RO_FUNCTION("parent",BL_ArmatureChannel,py_attr_getattr),        
+       KX_PYATTRIBUTE_RO_FUNCTION("bone",BL_ArmatureChannel,py_attr_getattr),
+       KX_PYATTRIBUTE_RO_FUNCTION("parent",BL_ArmatureChannel,py_attr_getattr),
        
        { NULL }        //Sentinel
 };
@@ -147,7 +147,7 @@ PyAttributeDef BL_ArmatureChannel::AttributesPtr[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectBL_ArmatureChannel::py_attr_getattr(void *self_v, const struct KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ArmatureChannel::py_attr_getattr(void *self_v, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ArmatureChannel* self= static_cast<BL_ArmatureChannel*>(self_v);
        bPoseChannel* channel = self->m_posechannel;
@@ -200,7 +200,7 @@ int BL_ArmatureChannel::py_attr_setattr(void *self_v, const struct KX_PYATTRIBUT
        return PY_SET_ATTR_FAIL;
 }
 
-PyObjectBL_ArmatureChannel::py_attr_get_joint_rotation(void *self_v, const struct KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ArmatureChannel::py_attr_get_joint_rotation(void *self_v, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
        bPoseChannel* pchan = static_cast<bPoseChannel*>(self_v);
        // decompose the pose matrix in euler rotation
@@ -223,7 +223,7 @@ PyObject* BL_ArmatureChannel::py_attr_get_joint_rotation(void *self_v, const str
        }
        // remove the rest pose to get the joint movement
        transpose_m3(rest_mat);
-       mul_m3_m3m3(joint_mat, rest_mat, pose_mat);             
+       mul_m3_m3m3(joint_mat, rest_mat, pose_mat);
        joints[0] = joints[1] = joints[2] = 0.f;
        // returns a 3 element list that gives corresponding joint
        int flag = 0;
@@ -458,7 +458,7 @@ PyObject *BL_ArmatureBone::py_bone_get_children(void *self, const struct KX_PYAT
        for (child=(Bone*)bone->childbase.first; child; child=(Bone*)child->next)
                count++;
 
-       PyObjectchildrenlist = PyList_New(count);
+       PyObject *childrenlist = PyList_New(count);
 
        for (count = 0, child=(Bone*)bone->childbase.first; child; child=(Bone*)child->next, ++count)
                PyList_SET_ITEM(childrenlist,count,NewProxyPlus_Ext(NULL,&Type,child,false));
index cd38ee2..b764d32 100644 (file)
@@ -62,11 +62,11 @@ public:
 
 #ifdef WITH_PYTHON
        // Python access
-       virtual PyObjectpy_repr(void);
+       virtual PyObject *py_repr(void);
 
-       static PyObjectpy_attr_getattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *py_attr_getattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-       static PyObjectpy_attr_get_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *py_attr_get_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int py_attr_set_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 #endif // WITH_PYTHON
 };
index 7939d6e..169205d 100644 (file)
@@ -61,7 +61,7 @@ PyTypeObject BL_ArmatureConstraint::Type = {
        py_base_new
 };
 
-PyObjectBL_ArmatureConstraint::py_repr(void)
+PyObject *BL_ArmatureConstraint::py_repr(void)
 {
        return PyUnicode_FromString(m_name);
 }
@@ -267,8 +267,8 @@ PyMethodDef BL_ArmatureConstraint::Methods[] = {
 
 PyAttributeDef BL_ArmatureConstraint::Attributes[] = {
        // Keep these attributes in order of BCA_ defines!!! used by py_attr_getattr and py_attr_setattr
-       KX_PYATTRIBUTE_RO_FUNCTION("type",BL_ArmatureConstraint,py_attr_getattr),       
-       KX_PYATTRIBUTE_RO_FUNCTION("name",BL_ArmatureConstraint,py_attr_getattr),       
+       KX_PYATTRIBUTE_RO_FUNCTION("type",BL_ArmatureConstraint,py_attr_getattr),
+       KX_PYATTRIBUTE_RO_FUNCTION("name",BL_ArmatureConstraint,py_attr_getattr),
        KX_PYATTRIBUTE_RW_FUNCTION("enforce",BL_ArmatureConstraint,py_attr_getattr,py_attr_setattr),
        KX_PYATTRIBUTE_RW_FUNCTION("headtail",BL_ArmatureConstraint,py_attr_getattr,py_attr_setattr),
        KX_PYATTRIBUTE_RO_FUNCTION("lin_error",BL_ArmatureConstraint,py_attr_getattr),
@@ -286,7 +286,7 @@ PyAttributeDef BL_ArmatureConstraint::Attributes[] = {
 };
 
 
-PyObjectBL_ArmatureConstraint::py_attr_getattr(void *self_v, const struct KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ArmatureConstraint::py_attr_getattr(void *self_v, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ArmatureConstraint* self= static_cast<BL_ArmatureConstraint*>(self_v);
        bConstraint* constraint = self->m_constraint;
@@ -312,12 +312,12 @@ PyObject* BL_ArmatureConstraint::py_attr_getattr(void *self_v, const struct KX_P
        case BCA_ROTERROR:
                return PyFloat_FromDouble(constraint->rot_error);
        case BCA_TARGET:
-               if (!self->m_target)    
+               if (!self->m_target)
                        Py_RETURN_NONE;
                else
                        return self->m_target->GetProxy();
        case BCA_SUBTARGET:
-               if (!self->m_subtarget) 
+               if (!self->m_subtarget)
                        Py_RETURN_NONE;
                else
                        return self->m_subtarget->GetProxy();
index 0d79bb1..579153a 100644 (file)
@@ -115,9 +115,9 @@ public:
 #ifdef WITH_PYTHON
 
        // Python access
-       virtual PyObjectpy_repr(void);
+       virtual PyObject *py_repr(void);
 
-       static PyObjectpy_attr_getattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *py_attr_getattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 #endif // WITH_PYTHON
 };
index 7174a56..da73d7a 100644 (file)
@@ -430,7 +430,7 @@ void BL_ArmatureObject::ProcessReplica()
 
        m_pose = NULL;
        m_framePose = NULL;
-       game_copy_pose(&m_pose, pose, 1);       
+       game_copy_pose(&m_pose, pose, 1);
 }
 
 void BL_ArmatureObject::ReParentLogic()
@@ -521,7 +521,7 @@ bool BL_ArmatureObject::SetActiveAction(BL_ActionActuator *act, short priority,
                                SetPose(m_framePose);
                                if (m_activeAct && (m_activeAct!=act))
                                        /* Reset the blend timer since this new action cancels the old one */
-                                       m_activeAct->SetBlendTime(0.0); 
+                                       m_activeAct->SetBlendTime(0.0);
                        }
                        m_activeAct = act;
                        m_activePriority = priority;
@@ -648,12 +648,12 @@ PyAttributeDef BL_ArmatureObject::Attributes[] = {
        {NULL} //Sentinel
 };
 
-PyObjectBL_ArmatureObject::pyattr_get_constraints(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ArmatureObject::pyattr_get_constraints(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        return KX_PythonSeq_CreatePyObject((static_cast<BL_ArmatureObject*>(self_v))->m_proxy, KX_PYGENSEQ_OB_TYPE_CONSTRAINTS);
 }
 
-PyObjectBL_ArmatureObject::pyattr_get_channels(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ArmatureObject::pyattr_get_channels(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ArmatureObject* self = static_cast<BL_ArmatureObject*>(self_v);
        self->LoadChannels(); // make sure we have the channels
index 6274e77..4e7dc3d 100644 (file)
@@ -116,8 +116,8 @@ public:
 #ifdef WITH_PYTHON
 
        // PYTHON
-       static PyObjectpyattr_get_constraints(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-       static PyObjectpyattr_get_channels(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_constraints(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_channels(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        KX_PYMETHOD_DOC_NOARGS(BL_ArmatureObject, update);
 
 #endif // WITH_PYTHON
index 4a8541c..b59f3de 100644 (file)
@@ -216,7 +216,7 @@ static std::map<int, SCA_IInputDevice::KX_EnumInputs> create_translate_table()
                
        // SYSTEM                                                                                                  
                
-#if 0                  
+#if 0
        /* **** XXX **** */
        m[KEYBD                         ] = SCA_IInputDevice::KX_KEYBD;                  
        m[RAWKEYBD                      ] = SCA_IInputDevice::KX_RAWKEYBD;                  
@@ -229,7 +229,7 @@ static std::map<int, SCA_IInputDevice::KX_EnumInputs> create_translate_table()
        m[WINQUIT                       ] = SCA_IInputDevice::KX_WINQUIT;                  
        m[Q_FIRSTTIME           ] = SCA_IInputDevice::KX_Q_FIRSTTIME;                  
        /* **** XXX **** */
-#endif 
+#endif
                
        // standard keyboard                                                                                       
                
@@ -447,7 +447,7 @@ static void GetRGB(short type,
                        else { // backup white
                                c0 = KX_rgbaint2uint_new(color);
                                c1 = KX_rgbaint2uint_new(color);
-                               c2 = KX_rgbaint2uint_new(color);        
+                               c2 = KX_rgbaint2uint_new(color);
                                if (mface->v4)
                                        c3 = KX_rgbaint2uint_new( color );
                        }
@@ -469,7 +469,7 @@ static void GetRGB(short type,
                        }
                        c0 = KX_rgbaint2uint_new(color);
                        c1 = KX_rgbaint2uint_new(color);
-                       c2 = KX_rgbaint2uint_new(color);        
+                       c2 = KX_rgbaint2uint_new(color);
                        if (mface->v4)
                                c3 = KX_rgbaint2uint_new(color);
                } break;
@@ -478,7 +478,7 @@ static void GetRGB(short type,
                {
                        c0 = KX_rgbaint2uint_new(color);
                        c1 = KX_rgbaint2uint_new(color);
-                       c2 = KX_rgbaint2uint_new(color);        
+                       c2 = KX_rgbaint2uint_new(color);
                        if (mface->v4)
                                c3 = KX_rgbaint2uint_new(color);
                } break;
@@ -1150,7 +1150,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene,
 
                                        rgb0 = KX_rgbaint2uint_new(color);
                                        rgb1 = KX_rgbaint2uint_new(color);
-                                       rgb2 = KX_rgbaint2uint_new(color);      
+                                       rgb2 = KX_rgbaint2uint_new(color);
                                        
                                        if (mface->v4)
                                                rgb3 = KX_rgbaint2uint_new(color);
@@ -1694,7 +1694,7 @@ static void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
                        objprop.m_soft_numclusteriterations= blenderobject->bsoft->numclusteriterations;        /* number of iterations to refine collision clusters*/
                        //objprop.m_soft_welding = blenderobject->bsoft->welding;               /* welding */
                        /* disable welding: it doesn't bring any additional stability and it breaks the relation between soft body collision shape and graphic mesh */
-                       objprop.m_soft_welding = 0.f;           
+                       objprop.m_soft_welding = 0.f;
                        objprop.m_margin = blenderobject->bsoft->margin;
                        objprop.m_contactProcessingThreshold = 0.f;
                } else
@@ -2617,7 +2617,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                                KX_SlowParentRelation * slow_parent_relation = KX_SlowParentRelation::New(blenderchild->sf);
                                pcit->m_gamechildnode->SetParentRelation(slow_parent_relation);
                                break;
-                       }       
+                       }
                        case PARBONE:
                        {
                                // parent this to a bone
@@ -2741,7 +2741,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                        }
                
                
-               }       
+               }
 
                // create physics joints
        for (i=0;i<sumolist->GetCount();i++)
@@ -2825,7 +2825,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                                                                                        kxscene->GetPhysicsEnvironment()->setConstraintParam(constraintId,dof,1,-1);
                                                                                }
                                                                                dofbit<<=1;
-                                                                       }                                                               
+                                                                       }
                                                                }
                                                                else if (dat->type == PHY_LINEHINGE_CONSTRAINT)
                                                                {
index 61477fb..d14160d 100644 (file)
@@ -89,7 +89,7 @@ public:
 
 public:
        
-protected:     
+protected:
        
        RAS_Deformer            *m_pDeformer;
 
index c9371b9..b8002d0 100644 (file)
@@ -84,7 +84,7 @@ bool BL_MeshDeformer::Apply(RAS_IPolyMaterial*)
 }
 
 BL_MeshDeformer::~BL_MeshDeformer()
-{      
+{
        if (m_transverts)
                delete [] m_transverts;
        if (m_transnors)
index c1c94c2..eafed84 100644 (file)
@@ -175,7 +175,7 @@ bool BL_ModifierDeformer::Update(void)
                         * It may not be the case here because of replace mesh actuator */
                        Mesh *oldmesh = (Mesh*)blendobj->data;
                        blendobj->data = m_bmesh;
-                       /* execute the modifiers */             
+                       /* execute the modifiers */
                        DerivedMesh *dm = mesh_create_derived_no_virtual(m_scene, blendobj, m_transverts, CD_MASK_MESH);
                        /* restore object data */
                        blendobj->data = oldmesh;
index b4827b1..5d0c3bc 100644 (file)
@@ -54,7 +54,7 @@ public:
                                                Scene *scene,
                                                Object *bmeshobj,
                                                RAS_MeshObject *mesh)
-                                               :       
+                                               :
                                                BL_ShapeDeformer(gameobj,bmeshobj, mesh),
                                                m_lastModifierUpdate(-1),
                                                m_scene(scene),
index c339e10..8325e80 100644 (file)
@@ -83,7 +83,7 @@ BL_ShapeActionActuator::BL_ShapeActionActuator(SCA_IObject* gameobj,
        m_playtype(playtype),
        m_priority(priority),
        m_action(action),
-       m_framepropname(framepropname), 
+       m_framepropname(framepropname),
        m_propname(propname)
 {
        m_idptr = new PointerRNA();
@@ -526,7 +526,7 @@ PyAttributeDef BL_ShapeActionActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectBL_ShapeActionActuator::pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *BL_ShapeActionActuator::pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        BL_ShapeActionActuator* self= static_cast<BL_ShapeActionActuator*>(self_v);
        return PyUnicode_FromString(self->GetAction() ? self->GetAction()->id.name+2 : "");
index efc1b54..ecf501d 100644 (file)
@@ -73,7 +73,7 @@ public:
        };
 
 protected:
-       bool                    m_useShapeDrivers;      
+       bool                    m_useShapeDrivers;
        double                  m_lastShapeUpdate;
        struct Key*             m_key;
 
index c508623..c175c1e 100644 (file)
@@ -110,7 +110,7 @@ BL_SkinDeformer::BL_SkinDeformer(
        class RAS_MeshObject *mesh,
        bool release_object,
        bool recalc_normal,
-       BL_ArmatureObject* arma)        :       
+       BL_ArmatureObject* arma)        :
                BL_MeshDeformer(gameobj, bmeshobj_old, mesh),
                m_armobj(arma),
                m_lastArmaUpdate(-1),
@@ -327,7 +327,7 @@ void BL_SkinDeformer::BGEDeformVerts()
 bool BL_SkinDeformer::UpdateInternal(bool shape_applied)
 {
        /* See if the armature has been updated for this frame */
-       if (PoseUpdated()) {    
+       if (PoseUpdated()) {
 
                if (!shape_applied) {
                        /* store verts locally */
index fc3b75c..25da815 100644 (file)
@@ -199,7 +199,7 @@ void BlenderWorldInfo::setBackColor(float r, float g, float b)
        m_backgroundcolor[2] = b;
 }
 
-       void    
+       void
 BlenderWorldInfo::setMistStart(
        float d
 ) {
@@ -215,7 +215,7 @@ BlenderWorldInfo::setMistDistance(
 }
 
 
-       void    
+       void
 BlenderWorldInfo::setMistColorRed(
        float d
 ) {
@@ -231,7 +231,7 @@ BlenderWorldInfo::setMistColorGreen(
 }
 
 
-       void    
+       void
 BlenderWorldInfo::setMistColorBlue(
        float d
 ) {
index e00eb99..2cf706a 100644 (file)
@@ -73,27 +73,27 @@ public:
                float g,
                float b
        );
-               void    
+               void
        setMistStart(
                float d
        );
 
-               void    
+               void
        setMistDistance(
                float d
        );
 
-               void    
+               void
        setMistColorRed(
                float d
        );
 
-               void    
+               void
        setMistColorGreen(
                float d
        );
 
-               void    
+               void
        setMistColorBlue(
                float d
        );   
index f020aab..7221258 100644 (file)
@@ -78,5 +78,5 @@ KX_IScalarInterpolator *BL_InterpolatorList::GetScalarInterpolator(const char *r
                        return *i;
        }
        return NULL;
-}      
+}
 
index bc5a6ee..980aeef 100644 (file)
@@ -65,7 +65,7 @@ public:
        BL_InterpolatorList(struct bAction *action);
        ~BL_InterpolatorList();
 
-       KX_IScalarInterpolator *GetScalarInterpolator(const char *rna_path, int array_index);   
+       KX_IScalarInterpolator *GetScalarInterpolator(const char *rna_path, int array_index);
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
index 1c33524..9020720 100644 (file)
@@ -160,7 +160,7 @@ KX_BlenderSceneConverter::~KX_BlenderSceneConverter()
        while (itmat != m_materials.end()) {
                delete (*itmat).second;
                itmat++;
-       }       
+       }
 
 
        vector<pair<KX_Scene*,RAS_MeshObject*> >::iterator itm = m_meshobjects.begin();
@@ -201,7 +201,7 @@ bool KX_BlenderSceneConverter::TryAndLoadNewFile()
        // if not, clear the newfilename
        else
        {
-               m_newfilename = "";     
+               m_newfilename = "";
        }
 */
        return result;
@@ -335,7 +335,7 @@ void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
                                        ccdPhysEnv->setDebugMode(btIDebugDraw::DBG_DrawWireframe|btIDebugDraw::DBG_DrawAabb|btIDebugDraw::DBG_DrawContactPoints|btIDebugDraw::DBG_DrawText|btIDebugDraw::DBG_DrawConstraintLimits|btIDebugDraw::DBG_DrawConstraints);
                
                                //todo: get a button in blender ?
-                               //disable / enable debug drawing (contact points, aabb's etc)   
+                               //disable / enable debug drawing (contact points, aabb's etc)
                                //ccdPhysEnv->setDebugMode(1);
                                destinationscene->SetPhysicsEnvironment(ccdPhysEnv);
                                break;
@@ -689,7 +689,7 @@ void        KX_BlenderSceneConverter::ResetPhysicsObjectsAnimationIpo(bool clearIpo)
 
 void   KX_BlenderSceneConverter::resetNoneDynamicObjectToIpo()
 {
-       if (addInitFromFrame) {         
+       if (addInitFromFrame) {
                KX_SceneList* scenes = m_ketsjiEngine->CurrentScenes();
                int numScenes = scenes->size();
                if (numScenes>=0) {
@@ -704,7 +704,7 @@ void        KX_BlenderSceneConverter::resetNoneDynamicObjectToIpo()
                                        if (blenderobject->type==OB_ARMATURE)
                                                continue;
                                        float eu[3];
-                                       mat4_to_eul(eu,blenderobject->obmat);                                   
+                                       mat4_to_eul(eu,blenderobject->obmat);
                                        MT_Point3 pos = MT_Point3(
                                                blenderobject->obmat[3][0],
                                                blenderobject->obmat[3][1],
@@ -779,8 +779,8 @@ void        KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
                                        //const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
                                        const MT_Matrix3x3& orn = gameObj->NodeGetWorldOrientation();
                                        
-                                       float eulerAngles[3];   
-                                       float eulerAnglesOld[3] = {0.0f, 0.0f, 0.0f};                                           
+                                       float eulerAngles[3];
+                                       float eulerAnglesOld[3] = {0.0f, 0.0f, 0.0f};
                                        float tmat[3][3];
                                        
                                        // XXX animato
@@ -984,7 +984,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
        }
        
        main_newlib= (Main *)MEM_callocN( sizeof(Main), "BgeMain");
-       BKE_reports_init(&reports, RPT_STORE);  
+       BKE_reports_init(&reports, RPT_STORE);
 
        load_datablocks(main_newlib, bpy_openlib, path, idcode);
 
@@ -1000,11 +1000,11 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
        BLO_blendhandle_close(bpy_openlib);
 
        BKE_reports_clear(&reports);
-       /* done linking */      
+       /* done linking */
        
        /* needed for lookups*/
        GetMainDynamic().push_back(main_newlib);
-       strncpy(main_newlib->name, path, sizeof(main_newlib->name));    
+       strncpy(main_newlib->name, path, sizeof(main_newlib->name));
        
        
        if (idcode==ID_ME) {
@@ -1028,7 +1028,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
                        scene_merge->GetLogicManager()->RegisterActionName(action->name+2, action);
                }
        }
-       else if (idcode==ID_SCE) {              
+       else if (idcode==ID_SCE) {
                /* Merge all new linked in scene into the existing one */
                ID *scene;
                for (scene= (ID *)main_newlib->scene.first; scene; scene= (ID *)scene->next ) {
@@ -1117,7 +1117,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
                                {
                                        RAS_MeshObject *meshobj= (RAS_MeshObject *) *mapStringToMeshes.at(i);
                                        if (meshobj && IS_TAGGED(meshobj->GetMesh()))
-                                       {       
+                                       {
                                                STR_HashedString mn = meshobj->GetName();
                                                mapStringToMeshes.remove(mn);
                                                m_map_mesh_to_gamemesh.remove(CHashedPtr(meshobj->GetMesh()));
@@ -1255,7 +1255,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
                RAS_IPolyMaterial *mat= (*polymit).second;
                Material *bmat= NULL;
 
-               /* Why do we need to check for RAS_BLENDERMAT if both are cast to a (PyObject*)? - Campbell */
+               /* Why do we need to check for RAS_BLENDERMAT if both are cast to a (PyObject *)? - Campbell */
                if (mat->GetFlag() & RAS_BLENDERMAT) {
                        KX_BlenderMaterial *bl_mat = static_cast<KX_BlenderMaterial*>(mat);
                        bmat= bl_mat->GetBlenderMaterial();
@@ -1280,7 +1280,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
                RAS_IPolyMaterial *mat= (*polymit).second;
                Material *bmat= NULL;
 
-               /* Why do we need to check for RAS_BLENDERMAT if both are cast to a (PyObject*)? - Campbell */
+               /* Why do we need to check for RAS_BLENDERMAT if both are cast to a (PyObject *)? - Campbell */
                if (mat->GetFlag() & RAS_BLENDERMAT) {
                        KX_BlenderMaterial *bl_mat = static_cast<KX_BlenderMaterial*>(mat);
                        bmat= bl_mat->GetBlenderMaterial();
index 9caa6bb..287be3b 100644 (file)
@@ -903,7 +903,7 @@ void BL_ConvertActuators(const char* maggiename,
                                        modeArg = SCA_RandomActuator::KX_RANDOMACT_FLOAT_NEGATIVE_EXPONENTIAL;
                                        break;
                                default:
-                                       ; /* error */                           
+                                       ; /* error */
                                }
                                tmprandomact = new SCA_RandomActuator(gameobj,
                                        seedArg,
index 8177892..3a6aa22 100644 (file)
@@ -69,7 +69,7 @@
        static void
 LinkControllerToActuators(
        SCA_IController *game_controller,
-       bController* bcontr,    
+       bController* bcontr,
        SCA_LogicManager* logicmgr,
        KX_BlenderSceneConverter* converter
 ) {
index faa7780..fc14c9d 100644 (file)
@@ -67,7 +67,7 @@ void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventMan
 {
        
        bProperty* prop = (bProperty*)object->prop.first;
-       CValue* propval;        
+       CValue* propval;
        bool show_debug_info;
        while(prop)
        {
index 9f155a6..3d4f3ae 100644 (file)
@@ -183,7 +183,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
                                        
                                        
                                        if (gameobj->GetPhysicsController())
-                                       {       
+                                       {
                                                gamesensor = new KX_TouchSensor(eventmgr,
                                                        gameobj,
                                                        bFindMaterial,
@@ -209,7 +209,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
                                        }
                                        bool bFindMaterial = true;
                                        if (gameobj->GetPhysicsController())
-                                       {       
+                                       {
                                                gamesensor = new KX_TouchSensor(eventmgr,
                                                        gameobj,
                                                        bFindMaterial,
@@ -224,7 +224,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
                                KX_NetworkEventManager* eventmgr = (KX_NetworkEventManager*)
                                        logicmgr->FindEventManager(SCA_EventManager::NETWORK_EVENTMGR);
                                if (eventmgr) {
-                                       bMessageSensor* msgSens = (bMessageSensor*) sens->data; 
+                                       bMessageSensor* msgSens = (bMessageSensor*) sens->data;
                                        
                                        /* Get our NetworkScene */
                                        NG_NetworkScene *NetworkScene = kxscene->GetNetworkScene();
@@ -247,7 +247,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
                                SCA_EventManager* eventmgr = logicmgr->FindEventManager(SCA_EventManager::TOUCH_EVENTMGR);
                                if (eventmgr)
                                {
-                                       STR_String nearpropertyname;    
+                                       STR_String nearpropertyname;
                                        bNearSensor* blendernearsensor = (bNearSensor*)sens->data;
                                        if (blendernearsensor->name)
                                        {
@@ -311,7 +311,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
                        }
                case SENS_MOUSE:
                        {
-                               int keytype = SCA_MouseSensor::KX_MOUSESENSORMODE_NODEF;                        
+                               int keytype = SCA_MouseSensor::KX_MOUSESENSORMODE_NODEF;
                                int trackfocus = 0;
                                bMouseSensor *bmouse = (bMouseSensor *)sens->data;
                                
@@ -639,7 +639,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
                        gamesensor->SetInvert(invert);
                        gamesensor->SetLevel(level);
                        gamesensor->SetTap(tap);
-                       gamesensor->SetName(sens->name);                        
+                       gamesensor->SetName(sens->name);
                        
                        gameobj->AddSensor(gamesensor);
                        
index 309959b..12f8825 100644 (file)
@@ -76,12 +76,12 @@ static BL_InterpolatorList *GetAdtList(struct bAction *for_act, KX_BlenderSceneC
 {
        BL_InterpolatorList *adtList= converter->FindInterpolatorList(for_act);
 
-       if (!adtList) {         
+       if (!adtList) {
                adtList = new BL_InterpolatorList(for_act);
                converter->RegisterInterpolatorList(adtList, for_act);
        }
                        
-       return adtList; 
+       return adtList;
 }
 
 SG_Controller *BL_CreateIPO(struct bAction *action, KX_GameObject* gameobj, KX_BlenderSceneConverter *converter)
@@ -441,7 +441,7 @@ static void ConvertMaterialIpos(
                        }
                        interpolator= new KX_ScalarInterpolator(&ipocontr->m_ref, sinterp);
                        ipocontr->AddInterpolator(interpolator);
-               }       
+               }
                
                if ((sinterp = adtList->GetScalarInterpolator("emit", 0))) {
                        if (!ipocontr) {
@@ -452,7 +452,7 @@ static void ConvertMaterialIpos(
                        interpolator= new KX_ScalarInterpolator(&ipocontr->m_emit, sinterp);
                        ipocontr->AddInterpolator(interpolator);
                }
-       }               
+       }
 }
 
 void BL_ConvertMaterialIpos(
index 40997a2..e640923 100644 (file)
@@ -205,7 +205,7 @@ CValue* CBoolValue::GetReplica()
 }
 
 #ifdef WITH_PYTHON
-PyObjectCBoolValue::ConvertValueToPython()
+PyObject *CBoolValue::ConvertValueToPython()
 {
        return PyBool_FromLong(m_bool != 0);
 }
index 09e931e..64ac026 100644 (file)
@@ -29,7 +29,7 @@
 class CBoolValue : public CPropValue  
 {
 
-       //PLUGIN_DECLARE_SERIAL(CBoolValue,CValue)      
+       //PLUGIN_DECLARE_SERIAL(CBoolValue,CValue)
 
 public:
        static const STR_String sTrueString;
index 4033385..c9b59e5 100644 (file)
@@ -314,7 +314,7 @@ CValue* CFloatValue::GetReplica()
 
 
 #ifdef WITH_PYTHON
-PyObjectCFloatValue::ConvertValueToPython()
+PyObject *CFloatValue::ConvertValueToPython()
 {
        return PyFloat_FromDouble(m_float);
 }
index 5883723..bdf4ee4 100644 (file)
@@ -543,7 +543,7 @@ CExpression *CParser::Ex(int i)
                                        }
                                        e1 = Error(errtext);
 
-                                       break;                          
+                                       break;
                                }
                        default:
                                NextSym();
@@ -573,7 +573,7 @@ CExpression* CParser::ProcessText
        text = intext;
        
        
-       chcount = 0;    
+       chcount = 0;
        if (text.Length() == 0) {
                return NULL;
        }
index 2d42744..12d6e25 100644 (file)
@@ -326,7 +326,7 @@ void CIntValue::SetValue(CValue* newval)
 
 
 #ifdef WITH_PYTHON
-PyObjectCIntValue::ConvertValueToPython()
+PyObject *CIntValue::ConvertValueToPython()
 {
        if ((m_int > INT_MIN) && (m_int < INT_MAX))
                return PyLong_FromSsize_t(m_int);
index ffc6ff6..866689e 100644 (file)
@@ -50,7 +50,7 @@ public:
        inline friend bool operator ==( const CHashedPtr & rhs,const CHashedPtr & lhs)
        {
                return rhs.m_valptr == lhs.m_valptr;
-       }       
+       }
        
        
 #ifdef WITH_CXX_GUARDEDALLOC
index ef82b9e..88b0a98 100644 (file)
@@ -278,7 +278,7 @@ bool CListValue::IsModified()
 /* Python interface ---------------------------------------------------- */
 /* --------------------------------------------------------------------- */
 
-static Py_ssize_t listvalue_bufferlen(PyObjectself)
+static Py_ssize_t listvalue_bufferlen(PyObject *self)
 {
        CListValue *list= static_cast<CListValue *>(BGE_PROXY_REF(self));
        if (list==NULL)
@@ -287,7 +287,7 @@ static Py_ssize_t listvalue_bufferlen(PyObject* self)
        return (Py_ssize_t)list->GetCount();
 }
 
-static PyObject* listvalue_buffer_item(PyObject* self, Py_ssize_t index)
+static PyObject *listvalue_buffer_item(PyObject *self, Py_ssize_t index)
 {
        CListValue *list= static_cast<CListValue *>(BGE_PROXY_REF(self));
        CValue *cval;
@@ -309,14 +309,14 @@ static PyObject* listvalue_buffer_item(PyObject* self, Py_ssize_t index)
        
        cval= list->GetValue(index);
        
-       PyObjectpyobj = cval->ConvertValueToPython();
+       PyObject *pyobj = cval->ConvertValueToPython();
        if (pyobj)
                return pyobj;
        else
                return cval->GetProxy();
 }
 
-static PyObject* listvalue_mapping_subscript(PyObject* self, PyObject* pyindex)
+static PyObject *listvalue_mapping_subscript(PyObject *self, PyObject *pyindex)
 {
        CListValue *list= static_cast<CListValue *>(BGE_PROXY_REF(self));
        if (list==NULL) {
@@ -328,7 +328,7 @@ static PyObject* listvalue_mapping_subscript(PyObject* self, PyObject* pyindex)
        {
                CValue *item = ((CListValue*) list)->FindValue(_PyUnicode_AsString(pyindex));
                if (item) {
-                       PyObjectpyobj = item->ConvertValueToPython();
+                       PyObject *pyobj = item->ConvertValueToPython();
                        if (pyobj)
                                return pyobj;
                        else
@@ -348,7 +348,7 @@ static PyObject* listvalue_mapping_subscript(PyObject* self, PyObject* pyindex)
 
 
 /* just slice it into a python list... */
-static PyObject* listvalue_buffer_slice(PyObject* self,Py_ssize_t ilow, Py_ssize_t ihigh)
+static PyObject *listvalue_buffer_slice(PyObject *self,Py_ssize_t ilow, Py_ssize_t ihigh)
 {
        CListValue *list= static_cast<CListValue *>(BGE_PROXY_REF(self));
        if (list==NULL) {
@@ -374,17 +374,17 @@ static PyObject* listvalue_buffer_slice(PyObject* self,Py_ssize_t ilow, Py_ssize
 
        for (i = ilow, j = 0; i < ihigh; i++, j++)
        {
-               PyObjectpyobj = list->GetValue(i)->ConvertValueToPython();
+               PyObject *pyobj = list->GetValue(i)->ConvertValueToPython();
                if (!pyobj)
                        pyobj = list->GetValue(i)->GetProxy();
                PyList_SET_ITEM(newlist, i, pyobj);
-       }       
+       }
        return newlist;
 }
 
 
 /* clist + list, return a list that python owns */
-static PyObject *listvalue_buffer_concat(PyObject * self, PyObject * other)
+static PyObject *listvalue_buffer_concat(PyObject *self, PyObject *other)
 {
        CListValue *listval= static_cast<CListValue *>(BGE_PROXY_REF(self));
        Py_ssize_t i, numitems, numitems_orig;
@@ -560,7 +560,7 @@ PyAttributeDef CListValue::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObject* CListValue::Pyappend(PyObject* value)
+PyObject *CListValue::Pyappend(PyObject *value)
 {
        CValue* objval = ConvertPythonToValue(value, "CList.append(i): CValueList, ");
 
@@ -577,15 +577,15 @@ PyObject* CListValue::Pyappend(PyObject* value)
        Py_RETURN_NONE;
 }
 
-PyObjectCListValue::Pyreverse()
+PyObject *CListValue::Pyreverse()
 {
        std::reverse(m_pValueArray.begin(),m_pValueArray.end());
        Py_RETURN_NONE;
 }
 
-PyObjectCListValue::Pyindex(PyObject *value)
+PyObject *CListValue::Pyindex(PyObject *value)
 {
-       PyObjectresult = NULL;
+       PyObject *result = NULL;
 
        CValue* checkobj = ConvertPythonToValue(value, "val = cList[i]: CValueList, ");
        if (checkobj==NULL)
@@ -612,7 +612,7 @@ PyObject* CListValue::Pyindex(PyObject *value)
 
 
 
-PyObject* CListValue::Pycount(PyObject* value)
+PyObject *CListValue::Pycount(PyObject *value)
 {
        int numfound = 0;
 
@@ -638,17 +638,17 @@ PyObject* CListValue::Pycount(PyObject* value)
 }
 
 /* Matches python dict.get(key, [default]) */
-PyObjectCListValue::Pyget(PyObject *args)
+PyObject *CListValue::Pyget(PyObject *args)
 {
        char *key;
-       PyObjectdef = Py_None;
+       PyObject *def = Py_None;
 
        if (!PyArg_ParseTuple(args, "s|O:get", &key, &def))
                return NULL;
 
        CValue *item = FindValue((const char *)key);
        if (item) {
-               PyObjectpyobj = item->ConvertValueToPython();
+               PyObject *pyobj = item->ConvertValueToPython();
                if (pyobj)
                        return pyobj;
                else
@@ -659,7 +659,7 @@ PyObject* CListValue::Pyget(PyObject *args)
 }
 
 
-PyObject* CListValue::Pyfrom_id(PyObject* value)
+PyObject *CListValue::Pyfrom_id(PyObject *value)
 {
        uintptr_t id= (uintptr_t)PyLong_AsVoidPtr(value);
 
index 4d104a4..2000508 100644 (file)
@@ -64,7 +64,7 @@ public:
        bool CheckEqual(CValue* first,CValue* second);
 
 #ifdef WITH_PYTHON
-       virtual PyObjectpy_repr(void) {
+       virtual PyObject *py_repr(void) {
                PyObject *py_proxy= this->GetProxy();
                PyObject *py_list= PySequence_List(py_proxy);
                PyObject *py_string= PyObject_Repr(py_list);
index 2224b0f..d0240b5 100644 (file)
@@ -102,7 +102,7 @@ and m_rhs
                
                m_cached_calculate = ffleft->Calc(m_op,ffright);
                
-               //if (m_cached_calculate)                               
+               //if (m_cached_calculate)
                //      m_cached_calculate->Action(CValue::SETOWNEREXPR,&CVoidValue(this,false,CValue::STACKVALUE));
 
                ffleft->Release();
@@ -163,7 +163,7 @@ bool COperator2Expr::IsInside(float x, float y, float z,bool bBorderInclude)
                        }
        }
        
-       return inside;  
+       return inside;
 }
 
 
@@ -241,7 +241,7 @@ CExpression* COperator2Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlink
        
        if (m_rhs)
                return Release(m_rhs->AddRef());
-/              
+/
 
   */
        return Release();
index a35cb4f..6bb2f03 100644 (file)
@@ -145,7 +145,7 @@ PyObject *PyObjectPlus::py_base_repr(PyObject *self)                        // This should be the ent
 }
 
 
-PyObject * PyObjectPlus::py_base_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+PyObject *PyObjectPlus::py_base_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
        PyTypeObject *base_type;
        PyObjectPlus_Proxy *base = NULL;
@@ -270,7 +270,7 @@ PyAttributeDef PyObjectPlus::Attributes[] = {
 
 
 
-PyObjectPyObjectPlus::pyattr_get_invalid(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *PyObjectPlus::pyattr_get_invalid(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        return PyBool_FromLong(self_v ? 0:1);
 }
@@ -303,7 +303,7 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef *
        ptr += attrdef->m_offset;
        if (attrdef->m_length > 1)
        {
-               PyObjectresultlist = PyList_New(attrdef->m_length);
+               PyObject *resultlist = PyList_New(attrdef->m_length);
                for (unsigned int i=0; i<attrdef->m_length; i++)
                {
                        switch (attrdef->m_type) {
@@ -420,7 +420,7 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef *
 #ifdef USE_MATHUTILS
                                                return Vector_CreatePyObject(val, attrdef->m_imax, Py_NEW, NULL);
 #else
-                                               PyObjectresultlist = PyList_New(attrdef->m_imax);
+                                               PyObject *resultlist = PyList_New(attrdef->m_imax);
                                                for (unsigned int i=0; i<attrdef->m_imax; i++)
                                                {
                                                        PyList_SET_ITEM(resultlist,i,PyFloat_FromDouble(val[i]));
@@ -437,10 +437,10 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef *
 #ifdef USE_MATHUTILS
                                        return Matrix_CreatePyObject(val, attrdef->m_imin, attrdef->m_imax, Py_WRAP, NULL);
 #else
-                                       PyObjectcollist = PyList_New(attrdef->m_imin);
+                                       PyObject *collist = PyList_New(attrdef->m_imin);
                                        for (unsigned int i=0; i<attrdef->m_imin; i++)
                                        {
-                                               PyObjectcol = PyList_New(attrdef->m_imax);
+                                               PyObject *col = PyList_New(attrdef->m_imax);
                                                for (unsigned int j=0; j<attrdef->m_imax; j++)
                                                {
                                                        PyList_SET_ITEM(col,j,PyFloat_FromDouble(val[j]));
@@ -460,7 +460,7 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef *
                                val->getValue(fval);
                                return Vector_CreatePyObject(fval, 3, Py_NEW, NULL);
 #else
-                               PyObjectresultlist = PyList_New(3);
+                               PyObject *resultlist = PyList_New(3);
                                for (unsigned int i=0; i<3; i++)
                                {
                                        PyList_SET_ITEM(resultlist,i,PyFloat_FromDouble((*val)[i]));
@@ -1100,7 +1100,7 @@ int PyObjectPlus::py_set_attrdef(PyObject *self_py, PyObject *value, const PyAtt
        }
        if (undoBuffer)
                free(undoBuffer);
-       return 0;       
+       return 0;
 }
 
 
@@ -1139,7 +1139,7 @@ PyObject *PyObjectPlus::NewProxyPlus_Ext(PyObjectPlus *self, PyTypeObject *tp, v
        if (!self) 
        {
                // in case of proxy without reference to game object
-               PyObjectproxy = reinterpret_cast<PyObject *>PyObject_NEW( PyObjectPlus_Proxy, tp);
+               PyObject *proxy = reinterpret_cast<PyObject *>PyObject_NEW( PyObjectPlus_Proxy, tp);
                BGE_PROXY_PYREF(proxy) = false;
                BGE_PROXY_PYOWNS(proxy) = py_owns;
                BGE_PROXY_REF(proxy) = NULL; 
index f74ed7d..005bf2f 100644 (file)
@@ -190,9 +190,9 @@ public:                                                                       \
  * macro is one that also requires a documentation string
  */
 #define KX_PYMETHOD(class_name, method_name)                                   \
-       PyObject* Py##method_name(PyObject* args, PyObject* kwds);                 \
-       static PyObject                                                          \
-       sPy##method_name(PyObject* self, PyObject* args, PyObject* kwds) {         \
+       PyObject *Py##method_name(PyObject *args, PyObject *kwds);                 \
+       static PyObject *                                                          \
+       sPy##method_name(PyObject *self, PyObject *args, PyObject *kwds) {         \
                if(BGE_PROXY_REF(self)==NULL) {                                        \
                        PyErr_SetString(PyExc_RuntimeError,                                \
                                        #class_name "." #method_name "() - "               \
@@ -203,9 +203,9 @@ public:                                                                       \
        }                                                                          \
 
 #define KX_PYMETHOD_VARARGS(class_name, method_name)                           \
-       PyObject* Py##method_name(PyObject* args);                                 \
+       PyObject *Py##method_name(PyObject *args);                                 \
        static PyObject*                                                           \
-       sPy##method_name(PyObject* self, PyObject* args) {                         \
+       sPy##method_name(PyObject *self, PyObject *args) {                         \
                if(BGE_PROXY_REF(self)==NULL) {                                        \
                        PyErr_SetString(PyExc_RuntimeError,                                \
                                        #class_name "." #method_name "() - "               \
@@ -215,9 +215,9 @@ public:                                                                       \
        }                                                                          \
 
 #define KX_PYMETHOD_NOARGS(class_name, method_name)                            \
-       PyObjectPy##method_name();                                               \
+       PyObject *Py##method_name();                                               \
        static PyObject*                                                           \
-       sPy##method_name(PyObjectself) {                                         \
+       sPy##method_name(PyObject *self) {                                         \
                if(BGE_PROXY_REF(self)==NULL) {                                        \
                        PyErr_SetString(PyExc_RuntimeError,                                \
                                        #class_name "." #method_name "() - "               \
@@ -227,9 +227,9 @@ public:                                                                       \
        }                                                                          \
 
 #define KX_PYMETHOD_O(class_name, method_name)                                 \
-       PyObject* Py##method_name(PyObject* value);                                \
+       PyObject *Py##method_name(PyObject *value);                                \
        static PyObject*                                                           \
-       sPy##method_name(PyObject* self, PyObject* value) {                        \
+       sPy##method_name(PyObject *self, PyObject *value) {                        \
                if(BGE_PROXY_REF(self)==NULL) {                                        \
                        PyErr_SetString(PyExc_RuntimeError,                                \
                                        #class_name "." #method_name "(value) - "          \
@@ -239,9 +239,9 @@ public:                                                                       \
        }                                                                          \
 
 #define KX_PYMETHOD_DOC(class_name, method_name)                               \
-       PyObject* Py##method_name(PyObject* args, PyObject* kwds);                 \
+       PyObject *Py##method_name(PyObject *args, PyObject *kwds);                 \
        static PyObject*                                                           \
-       sPy##method_name(PyObject* self, PyObject* args, PyObject* kwds) {         \
+       sPy##method_name(PyObject *self, PyObject *args, PyObject *kwds) {         \
                if(BGE_PROXY_REF(self)==NULL) {                                        \
                        PyErr_SetString(PyExc_RuntimeError,                                \
                                        #class_name "." #method_name "(...) - "            \
@@ -252,9 +252,9 @@ public:                                                                       \
        static const char method_name##_doc[];                                     \
 
 #define KX_PYMETHOD_DOC_VARARGS(class_name, method_name)                       \
-       PyObject* Py##method_name(PyObject* args);                                 \
+       PyObject *Py##method_name(PyObject *args);                                 \
        static PyObject*                                                           \
-       sPy##method_name(PyObject* self, PyObject* args) {                         \
+       sPy##method_name(PyObject *self, PyObject *args) {                         \
                if(BGE_PROXY_REF(self)==NULL) {                                        \
                        PyErr_SetString(PyExc_RuntimeError,                                \
                                        #class_name "." #method_name "(...) - "            \
@@ -266,9 +266,9 @@ public:                                                                       \
        static const char method_name##_doc[];                                     \
 
 #define KX_PYMETHOD_DOC_O(class_name, method_name)                             \
-       PyObject* Py##method_name(PyObject* value);                                \
-       static PyObject                                                          \
-       sPy##method_name(PyObject* self, PyObject* value) {                        \
+       PyObject *Py##method_name(PyObject *value);                                \
+       static PyObject *                                                          \
+       sPy##method_name(PyObject *self, PyObject *value) {                        \
                if(BGE_PROXY_REF(self)==NULL) {                                        \
                        PyErr_SetString(PyExc_RuntimeError,                                \
                                        #class_name "." #method_name "(value) - "          \
@@ -280,9 +280,9 @@ public:                                                                       \
        static const char method_name##_doc[];                                     \
 
 #define KX_PYMETHOD_DOC_NOARGS(class_name, method_name)                        \
-       PyObjectPy##method_name();                                               \
-       static PyObject                                                          \
-       sPy##method_name(PyObjectself) {                                         \
+       PyObject *Py##method_name();                                               \
+       static PyObject *                                                          \
+       sPy##method_name(PyObject *self) {                                         \
                if(BGE_PROXY_REF(self)==NULL) {                                        \
                        PyErr_SetString(PyExc_RuntimeError,                                \
                                        #class_name "." #method_name "() - "               \
@@ -315,19 +315,19 @@ public:                                                                       \
  */
 #define KX_PYMETHODDEF_DOC(class_name, method_name, doc_string) \
 const char class_name::method_name##_doc[] = doc_string; \
-PyObject* class_name::Py##method_name(PyObject* args, PyObject* kwds)
+PyObject *class_name::Py##method_name(PyObject *args, PyObject *kwds)
 
 #define KX_PYMETHODDEF_DOC_VARARGS(class_name, method_name, doc_string) \
 const char class_name::method_name##_doc[] = doc_string; \
-PyObject* class_name::Py##method_name(PyObject* args)
+PyObject *class_name::Py##method_name(PyObject *args)
 
 #define KX_PYMETHODDEF_DOC_O(class_name, method_name, doc_string) \
 const char class_name::method_name##_doc[] = doc_string; \
-PyObject* class_name::Py##method_name(PyObject* value)
+PyObject *class_name::Py##method_name(PyObject *value)
 
 #define KX_PYMETHODDEF_DOC_NOARGS(class_name, method_name, doc_string) \
 const char class_name::method_name##_doc[] = doc_string; \
-PyObjectclass_name::Py##method_name()
+PyObject *class_name::Py##method_name()
 
 /**
  * Attribute management
@@ -354,7 +354,7 @@ enum KX_PYATTRIBUTE_ACCESS {
 struct KX_PYATTRIBUTE_DEF;
 typedef int (*KX_PYATTRIBUTE_CHECK_FUNCTION)(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 typedef int (*KX_PYATTRIBUTE_SET_FUNCTION)(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-typedef PyObject(*KX_PYATTRIBUTE_GET_FUNCTION)(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+typedef PyObject *(*KX_PYATTRIBUTE_GET_FUNCTION)(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
 typedef struct KX_PYATTRIBUTE_DEF {
        const char *m_name;                             // name of the python attribute
index e37b463..bc102c6 100644 (file)
@@ -25,7 +25,7 @@ class CStringValue : public CPropValue
 {
 
        
-       //PLUGIN_DECLARE_SERIAL(CStringValue,CValue)            
+       //PLUGIN_DECLARE_SERIAL(CStringValue,CValue)
 public:
        /// Construction / destruction
        CStringValue();
index 6507cc3..bcfb7e9 100644 (file)
@@ -340,7 +340,7 @@ vector<STR_String> CValue::GetPropertyNames()
 // Clear all properties
 //
 void CValue::ClearProperties()
-{              
+{
        // Check if we have any properties
        if (m_pNamedPropertyArray == NULL)
                return;
@@ -530,13 +530,13 @@ PyAttributeDef CValue::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObject * CValue::pyattr_get_name(void * self_v, const KX_PYATTRIBUTE_DEF * attrdef)
+PyObject *CValue::pyattr_get_name(void * self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        CValue * self = static_cast<CValue *> (self_v);
        return PyUnicode_From_STR_String(self->GetName());
 }
 
-CValue* CValue::ConvertPythonToValue(PyObjectpyobj, const char *error_prefix)
+CValue* CValue::ConvertPythonToValue(PyObject *pyobj, const char *error_prefix)
 {
 
        CValue* vallie = NULL;
@@ -551,7 +551,7 @@ CValue* CValue::ConvertPythonToValue(PyObject* pyobj, const char *error_prefix)
                Py_ssize_t numitems = PyList_GET_SIZE(pyobj);
                for (i=0;i<numitems;i++)
                {
-                       PyObjectlistitem = PyList_GetItem(pyobj,i); /* borrowed ref */
+                       PyObject *listitem = PyList_GetItem(pyobj,i); /* borrowed ref */
                        CValue* listitemval = ConvertPythonToValue(listitem, error_prefix);
                        if (listitemval)
                        {
@@ -597,7 +597,7 @@ CValue* CValue::ConvertPythonToValue(PyObject* pyobj, const char *error_prefix)
 
 }
 
-PyObjectCValue::ConvertKeysToPython(void)
+PyObject *CValue::ConvertKeysToPython(void)
 {
        if (m_pNamedPropertyArray)
        {
@@ -636,5 +636,5 @@ void CValue::SetColorOperator(VALUE_OPERATOR op)
 void CValue::SetValue(CValue* newval)
 { 
        // no one should get here
-       assertd(newval->GetNumber() == 10121969);       
+       assertd(newval->GetNumber() == 10121969);
 }
index e3b52e8..e0c4dae 100644 (file)
@@ -218,21 +218,21 @@ public:
        CValue();
 
 #ifdef WITH_PYTHON
-       //static PyObject*      PyMake(PyObject*,PyObject*);
+       //static PyObject *PyMake(PyObject *, PyObject *);
        virtual PyObject *py_repr(void)
        {
                return PyUnicode_From_STR_String(GetText());
        }
 
-       virtual PyObject*       ConvertValueToPython() {
+       virtual PyObject *ConvertValueToPython() {
                return NULL;
        }
 
-       virtual CValue* ConvertPythonToValue(PyObject* pyobj, const char *error_prefix);
+       virtual CValue *ConvertPythonToValue(PyObject *pyobj, const char *error_prefix);
        
-       static PyObject * pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
+       static PyObject *pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
        
-       virtual PyObjectConvertKeysToPython( void );
+       virtual PyObject *ConvertKeysToPython( void );
 #endif // WITH_PYTHON
 
        
@@ -250,13 +250,13 @@ public:
        };
 
        /// Reference Counting
-       int                                     GetRefCount()                                                                                   
+       int GetRefCount()
        { 
                return m_refcount; 
        }
 
        // Add a reference to this value
-       CValue*                         AddRef()                                                                                                
+       CValue *AddRef()
        {
                // Increase global reference count, used to see at the end of the program
                // if all CValue-derived classes have been dereferenced to 0
@@ -269,7 +269,7 @@ public:
        }
 
        // Release a reference to this value (when reference count reaches 0, the value is removed from the heap)
-       int                     Release()                                                               
+       int                     Release()
        {
                // Decrease global reference count, used to see at the end of the program
                // if all CValue-derived classes have been dereferenced to 0
@@ -354,16 +354,16 @@ public:
        virtual void            SetCustomFlag2(bool bCustomFlag)                                                { m_ValFlags.CustomFlag2 = bCustomFlag;}
        virtual bool            IsCustomFlag2()                                                                                 { return m_ValFlags.CustomFlag2;}
 
-protected:                                                                                                                                             
+protected:
        virtual void            DisableRefCount();                                                                              // Disable reference counting for this value
-       //virtual void          AddDataToReplica(CValue* replica);                                              
+       //virtual void          AddDataToReplica(CValue* replica);
        virtual                         ~CValue();
 private:
-       // Member variables                                                                                                                     
+       // Member variables
        std::map<STR_String,CValue*>*           m_pNamedPropertyArray;                                                                  // Properties for user/game etc
        ValueFlags                      m_ValFlags;                                                                                             // Frequently used flags in a bitfield (low memoryusage)
-       int                                     m_refcount;                                                                                             // Reference Counter    
-       static  double m_sZeroVec[3];   
+       int                                     m_refcount;                                                                                             // Reference Counter
+       static  double m_sZeroVec[3];
 
 };
 
index 685cc3f..912484a 100644 (file)
@@ -65,7 +65,7 @@ class SCA_Joystick
        /** 
         *support for JOYHAT_MAX hats (each is a direction)
         */
-       int m_hat_array[JOYHAT_MAX];    
+       int m_hat_array[JOYHAT_MAX];
        
        /**
         * Precision or range of the axes
index 3fda542..6d76f12 100644 (file)
@@ -238,19 +238,19 @@ PyAttributeDef SCA_IController::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectSCA_IController::pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_IController::pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_IController* self= static_cast<SCA_IController*>(self_v);
        return PyLong_FromSsize_t(self->m_statemask);
 }
 
-PyObjectSCA_IController::pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_IController::pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-       return KX_PythonSeq_CreatePyObject((static_cast<SCA_IController*>(self_v))->m_proxy, KX_PYGENSEQ_CONT_TYPE_SENSORS);    
+       return KX_PythonSeq_CreatePyObject((static_cast<SCA_IController*>(self_v))->m_proxy, KX_PYGENSEQ_CONT_TYPE_SENSORS);
 }
 
-PyObjectSCA_IController::pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_IController::pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-       return KX_PythonSeq_CreatePyObject((static_cast<SCA_IController*>(self_v))->m_proxy, KX_PYGENSEQ_CONT_TYPE_ACTUATORS);  
+       return KX_PythonSeq_CreatePyObject((static_cast<SCA_IController*>(self_v))->m_proxy, KX_PYGENSEQ_CONT_TYPE_ACTUATORS);
 }
 #endif // WITH_PYTHON
index 16626b0..f4fce03 100644 (file)
@@ -45,7 +45,7 @@ SCA_IInputDevice::SCA_IInputDevice()
 
 SCA_IInputDevice::~SCA_IInputDevice()
 {
-}      
+}
 
 void SCA_IInputDevice::HookEscape()
 {
@@ -134,6 +134,6 @@ void SCA_IInputDevice::NextFrame()
                        break;
                default:
                        ; /* error */
-               }       
+               }
        }
 }
index 0382a2e..66a1209 100644 (file)
@@ -69,7 +69,7 @@ class SCA_IInputDevice
 public:
 
        SCA_IInputDevice();
-       virtual ~SCA_IInputDevice();    
+       virtual ~SCA_IInputDevice();
 
        enum KX_EnumInputs {
        
@@ -120,17 +120,17 @@ public:
                KX_RETKEY = 13,
                KX_SPACEKEY = 32,
                KX_PADASTERKEY = 42,
-               KX_COMMAKEY = 44,               
-               KX_MINUSKEY = 45,               
+               KX_COMMAKEY = 44,
+               KX_MINUSKEY = 45,
                KX_PERIODKEY = 46,
                KX_ZEROKEY = 48,
                
                KX_ONEKEY,              // =49
-               KX_TWOKEY,              
+               KX_TWOKEY,
                KX_THREEKEY,
-               KX_FOURKEY,             
-               KX_FIVEKEY,             
-               KX_SIXKEY,              
+               KX_FOURKEY,
+               KX_FIVEKEY,
+               KX_SIXKEY,
                KX_SEVENKEY,
                KX_EIGHTKEY,
                KX_NINEKEY,             // = 57
@@ -170,14 +170,14 @@ public:
                KX_LEFTALTKEY,          
                KX_RIGHTALTKEY,         
                KX_RIGHTCTRLKEY,        
-               KX_RIGHTSHIFTKEY,       
+               KX_RIGHTSHIFTKEY,
                KX_LEFTSHIFTKEY,// 129
                
                KX_ESCKEY, // 130
                KX_TABKEY, //131
                
                
-               KX_LINEFEEDKEY,  // 132 
+               KX_LINEFEEDKEY,  // 132
                KX_BACKSPACEKEY,
                KX_DELKEY,
                KX_SEMICOLONKEY, // 135
@@ -188,13 +188,13 @@ public:
                
                KX_SLASHKEY,            //138
                KX_BACKSLASHKEY,
-               KX_EQUALKEY,            
-               KX_LEFTBRACKETKEY,      
+               KX_EQUALKEY,
+               KX_LEFTBRACKETKEY,
                KX_RIGHTBRACKETKEY,     // 142
                
                KX_LEFTARROWKEY, // 145
                KX_DOWNARROWKEY,
-               KX_RIGHTARROWKEY,       
+               KX_RIGHTARROWKEY,
                KX_UPARROWKEY,          // 148
        
                KX_PAD2 ,
index 018a939..cfbdc1e 100644 (file)
@@ -231,7 +231,7 @@ int SCA_ILogicBrick::CheckProperty(void *self, const PyAttributeDef *attrdef)
 }
 
 /*Attribute functions */
-PyObjectSCA_ILogicBrick::pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_ILogicBrick::pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_ILogicBrick* self= static_cast<SCA_ILogicBrick*>(self_v);
        CValue* parent = self->GetParent();
@@ -254,9 +254,9 @@ bool SCA_ILogicBrick::PyArgToBool(int boolArg)
        }
 }
 
-PyObjectSCA_ILogicBrick::BoolToPyArg(bool boolarg)
+PyObject *SCA_ILogicBrick::BoolToPyArg(bool boolarg)
 {
-       return PyLong_FromSsize_t(boolarg? KX_TRUE: KX_FALSE);  
+       return PyLong_FromSsize_t(boolarg? KX_TRUE: KX_FALSE);
 }
 
 #endif // WITH_PYTHON
index b505353..c5fa939 100644 (file)
@@ -157,7 +157,7 @@ protected:
        bool PyArgToBool(int boolArg);
 
        /** Convert a a c++ value to KX_TRUE, KX_FALSE in Python. */
-       PyObjectBoolToPyArg(bool);
+       PyObject *BoolToPyArg(bool);
        
 #endif // WITH_PYTHON
 
index b90952b..ab9e278 100644 (file)
@@ -224,7 +224,7 @@ SCA_IController* SCA_IObject::FindController(const STR_String& controllername)
                {
                        foundcontroller = (*itc);
                        break;
-               }       
+               }
        }
        return foundcontroller;
 }
index 0e65779..a850d23 100644 (file)
@@ -43,7 +43,7 @@ class SCA_IController;
 class SCA_IActuator;
 
 #ifdef WITH_PYTHON
-template<class T> T PyVecTo(PyObject*);
+template<class T> T PyVecTo(PyObject *);
 #endif
 
 typedef std::vector<SCA_ISensor *>       SCA_SensorList;
@@ -213,7 +213,7 @@ public:
         */
        unsigned int GetState(void)     { return m_state; }
 
-//     const class MT_Point3&  ConvertPythonPylist(PyObjectpylist);
+//     const class MT_Point3&  ConvertPythonPylist(PyObject *pylist);
 
        virtual int GetGameObjectType() {return -1;}
        
index 76b9a8d..7cf0b18 100644 (file)
@@ -248,7 +248,7 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr)
                if (result) {
                        // the sensor triggered this frame
                        if (m_state || !m_tap) {
-                               ActivateControllers(logicmgr);  
+                               ActivateControllers(logicmgr);
                                // reset these counters so that pulse are synchronized with transition
                                m_pos_ticks = 0;
                                m_neg_ticks = 0;
@@ -380,7 +380,7 @@ PyAttributeDef SCA_ISensor::Attributes[] = {
 };
 
 
-PyObjectSCA_ISensor::pyattr_get_triggered(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_ISensor::pyattr_get_triggered(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_ISensor* self= static_cast<SCA_ISensor*>(self_v);
        int retval = 0;
@@ -389,13 +389,13 @@ PyObject* SCA_ISensor::pyattr_get_triggered(void *self_v, const KX_PYATTRIBUTE_D
        return PyLong_FromSsize_t(retval);
 }
 
-PyObjectSCA_ISensor::pyattr_get_positive(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_ISensor::pyattr_get_positive(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_ISensor* self= static_cast<SCA_ISensor*>(self_v);
        return PyLong_FromSsize_t(self->GetState());
 }
 
-PyObjectSCA_ISensor::pyattr_get_status(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_ISensor::pyattr_get_status(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_ISensor* self= static_cast<SCA_ISensor*>(self_v);
        int status = 0;
@@ -417,13 +417,13 @@ PyObject* SCA_ISensor::pyattr_get_status(void *self_v, const KX_PYATTRIBUTE_DEF
        return PyLong_FromSsize_t(status);
 }
 
-PyObjectSCA_ISensor::pyattr_get_posTicks(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_ISensor::pyattr_get_posTicks(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_ISensor* self= static_cast<SCA_ISensor*>(self_v);
        return PyLong_FromLong(self->GetPosTicks());
 }
 
-PyObjectSCA_ISensor::pyattr_get_negTicks(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_ISensor::pyattr_get_negTicks(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_ISensor* self= static_cast<SCA_ISensor*>(self_v);
        return PyLong_FromLong(self->GetNegTicks());
index 2c6beb7..7e9a4bc 100644 (file)
@@ -60,7 +60,7 @@ SCA_JoystickSensor::SCA_JoystickSensor(class SCA_JoystickManager* eventmgr,
                                                                           m_joymode(joymode),
                                                                           m_joyindex(joyindex),
                                                                           m_bAllEvents(allevents)
-{      
+{
 /*
 std::cout << " axis "          << m_axis               << std::endl;
 std::cout << " axis flag "     << m_axisf              << std::endl;
@@ -308,7 +308,7 @@ PyAttributeDef SCA_JoystickSensor::Attributes[] = {
 const char SCA_JoystickSensor::GetButtonActiveList_doc[] = 
 "getButtonActiveList\n"
 "\tReturns a list containing the indices of the button currently pressed.\n";
-PyObjectSCA_JoystickSensor::PyGetButtonActiveList( )
+PyObject *SCA_JoystickSensor::PyGetButtonActiveList( )
 {
        SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
        PyObject *ls = PyList_New(0);
@@ -331,7 +331,7 @@ PyObject* SCA_JoystickSensor::PyGetButtonActiveList( )
 const char SCA_JoystickSensor::GetButtonStatus_doc[] = 
 "getButtonStatus(buttonIndex)\n"
 "\tReturns a bool of the current pressed state of the specified button.\n";
-PyObject* SCA_JoystickSensor::PyGetButtonStatus( PyObject* args )
+PyObject *SCA_JoystickSensor::PyGetButtonStatus( PyObject *args )
 {
        SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex);
        int index;
@@ -345,7 +345,7 @@ PyObject* SCA_JoystickSensor::PyGetButtonStatus( PyObject* args )
        return PyBool_FromLong(0);
 }
 
-PyObjectSCA_JoystickSensor::pyattr_get_axis_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_JoystickSensor::pyattr_get_axis_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
        SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
@@ -360,7 +360,7 @@ PyObject* SCA_JoystickSensor::pyattr_get_axis_values(void *self_v, const KX_PYAT
        return list;
 }
 
-PyObjectSCA_JoystickSensor::pyattr_get_axis_single(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_JoystickSensor::pyattr_get_axis_single(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
        SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
@@ -373,7 +373,7 @@ PyObject* SCA_JoystickSensor::pyattr_get_axis_single(void *self_v, const KX_PYAT
        return PyLong_FromSsize_t(joy->GetAxisPosition(self->m_axis-1));
 }
 
-PyObjectSCA_JoystickSensor::pyattr_get_hat_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_JoystickSensor::pyattr_get_hat_values(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
        SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
@@ -388,7 +388,7 @@ PyObject* SCA_JoystickSensor::pyattr_get_hat_values(void *self_v, const KX_PYATT
        return list;
 }
 
-PyObjectSCA_JoystickSensor::pyattr_get_hat_single(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_JoystickSensor::pyattr_get_hat_single(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
        SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
@@ -396,28 +396,28 @@ PyObject* SCA_JoystickSensor::pyattr_get_hat_single(void *self_v, const KX_PYATT
        return PyLong_FromSsize_t(joy->GetHat(self->m_hat-1));
 }
 
-PyObjectSCA_JoystickSensor::pyattr_get_num_axis(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_JoystickSensor::pyattr_get_num_axis(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
        SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
        return PyLong_FromSsize_t( joy ? joy->GetNumberOfAxes() : 0 );
 }
 
-PyObjectSCA_JoystickSensor::pyattr_get_num_buttons(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_JoystickSensor::pyattr_get_num_buttons(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
        SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
        return PyLong_FromSsize_t( joy ? joy->GetNumberOfButtons() : 0 );
 }
 
-PyObjectSCA_JoystickSensor::pyattr_get_num_hats(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_JoystickSensor::pyattr_get_num_hats(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
        SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
        return PyLong_FromSsize_t( joy ? joy->GetNumberOfHats() : 0 );
 }
 
-PyObjectSCA_JoystickSensor::pyattr_get_connected(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_JoystickSensor::pyattr_get_connected(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_JoystickSensor* self= static_cast<SCA_JoystickSensor*>(self_v);
        SCA_Joystick *joy = ((SCA_JoystickManager *)self->m_eventmgr)->GetJoystickDevice(self->m_joyindex);
index 2d9ad45..fd3c070 100644 (file)
@@ -54,7 +54,7 @@ public:
 
        bool                    IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode);
        
-       virtual void    NextFrame();    
+       virtual void    NextFrame();
        SCA_IInputDevice* GetInputDevice();
 
 
index 5208252..9a2dd9b 100644 (file)
@@ -351,12 +351,12 @@ void SCA_KeyboardSensor::AddToTargetProp(int keyIndex)
                                        CStringValue * newstringprop = new CStringValue(newprop, m_targetprop);
                                        GetParent()->SetProperty(m_targetprop, newstringprop);
                                        newstringprop->Release();
-                               }                               
+                               }
                        } else {
                                /* append */
                                char pchar = ToCharacter(keyIndex, IsShifted());
                                STR_String newprop = tprop->GetText() + pchar;
-                               CStringValue * newstringprop = new CStringValue(newprop, m_targetprop);                 
+                               CStringValue * newstringprop = new CStringValue(newprop, m_targetprop);
                                GetParent()->SetProperty(m_targetprop, newstringprop);
                                newstringprop->Release();
                        }
@@ -365,7 +365,7 @@ void SCA_KeyboardSensor::AddToTargetProp(int keyIndex)
                                /* Make a new property. Deletes can be ignored. */
                                char pchar = ToCharacter(keyIndex, IsShifted());
                                STR_String newprop = pchar;
-                               CStringValue * newstringprop = new CStringValue(newprop, m_targetprop);                 
+                               CStringValue * newstringprop = new CStringValue(newprop, m_targetprop);
                                GetParent()->SetProperty(m_targetprop, newstringprop);
                                newstringprop->Release();
                        }
@@ -376,7 +376,7 @@ void SCA_KeyboardSensor::AddToTargetProp(int keyIndex)
        
 /**
  * Tests whether shift is pressed
- */    
+ */
 bool SCA_KeyboardSensor::IsShifted(void)
 {
        SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
@@ -391,9 +391,10 @@ bool SCA_KeyboardSensor::IsShifted(void)
                         == SCA_InputEvent::KX_JUSTACTIVATED)
                ) {
                return true;
-       } else {
+       }
+       else {
                return false;
-       }       
+       }
 }
 
 void SCA_KeyboardSensor::LogKeystrokes(void) 
@@ -494,25 +495,25 @@ PyAttributeDef SCA_KeyboardSensor::Attributes[] = {
 };
 
 
-PyObjectSCA_KeyboardSensor::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_KeyboardSensor::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_KeyboardSensor* self= static_cast<SCA_KeyboardSensor*>(self_v);
        
        SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)self->m_eventmgr)->GetInputDevice();
 
-       PyObjectresultlist = PyList_New(0);
+       PyObject *resultlist = PyList_New(0);
        
        for (int i=SCA_IInputDevice::KX_BEGINKEY ; i<= SCA_IInputDevice::KX_ENDKEY;i++)
        {
                const SCA_InputEvent & inevent = inputdev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) i);
                if (inevent.m_status != SCA_InputEvent::KX_NO_INPUTSTATUS)
                {
-                       PyObjectkeypair = PyList_New(2);
+                       PyObject *keypair = PyList_New(2);
                        PyList_SET_ITEM(keypair,0,PyLong_FromSsize_t(i));
                        PyList_SET_ITEM(keypair,1,PyLong_FromSsize_t(inevent.m_status));
                        PyList_Append(resultlist,keypair);
                }
-       }       
+       }
        return resultlist;
 }
 
@@ -655,7 +656,7 @@ bool IsPrintable(int keyIndex)
 
 /**
  * Tests whether this is a delete key.
- */    
+ */
 bool IsDelete(int keyIndex)
 {
        if ( (keyIndex == SCA_IInputDevice::KX_DELKEY)
index c059aba..caa141e 100644 (file)
@@ -134,7 +134,7 @@ bool IsPrintable(int keyIndex);
 
 /**
  * Tests whether this is a delete key.
- */    
+ */
 bool IsDelete(int keyIndex);
 
 
index 60edb28..02c2880 100644 (file)
@@ -63,7 +63,7 @@ public:
         * mouse related events. Can also flag mouse movement.
         */
        bool IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode);
-       virtual void    NextFrame();    
+       virtual void    NextFrame();
        SCA_IInputDevice* GetInputDevice();
 
 
index f4ee54c..51e0bc6 100644 (file)
@@ -156,7 +156,7 @@ bool SCA_MouseSensor::Evaluate()
        case KX_MOUSESENSORMODE_WHEELDOWN:
                {
                        const SCA_InputEvent& mevent = mousedev->GetEventValue(m_hotkey);
-                       switch (mevent.m_status) {      
+                       switch (mevent.m_status) {
                        case SCA_InputEvent::KX_JUSTACTIVATED:
                                m_val = 1;
                                result = true;
@@ -189,15 +189,15 @@ bool SCA_MouseSensor::Evaluate()
                        const SCA_InputEvent& eventY = mousedev->GetEventValue(SCA_IInputDevice::KX_MOUSEY);
 
                        if (eventX.m_status == SCA_InputEvent::KX_JUSTACTIVATED ||
-                               eventY.m_status == SCA_InputEvent::KX_JUSTACTIVATED ||
-                               eventX.m_status == SCA_InputEvent::KX_ACTIVE ||
-                               eventY.m_status == SCA_InputEvent::KX_ACTIVE)   
+                           eventY.m_status == SCA_InputEvent::KX_JUSTACTIVATED ||
+                           eventX.m_status == SCA_InputEvent::KX_ACTIVE ||
+                           eventY.m_status == SCA_InputEvent::KX_ACTIVE)
                        {
                                m_val = 1;
                                result = true;
                        } 
                        else if (eventX.m_status == SCA_InputEvent::KX_JUSTRELEASED ||
-                                       eventY.m_status == SCA_InputEvent::KX_JUSTRELEASED )
+                                eventY.m_status == SCA_InputEvent::KX_JUSTRELEASED )
                        {
                                m_val = 0;
                                result = true;
index 31f988f..0eab618 100644 (file)
@@ -173,7 +173,7 @@ isValid(
        SCA_PropertyActuator::KX_ACT_PROP_MODE mode
 
 ) {
-       bool res = false;       
+       bool res = false;
        res = ((mode > KX_ACT_PROP_NODEF) && (mode < KX_ACT_PROP_MAX));
        return res;
 }
index ab7f57a..7dbbbb2 100644 (file)
@@ -179,7 +179,7 @@ int SCA_PythonController::IsTriggered(class SCA_ISensor* sensor)
 #ifdef WITH_PYTHON
 
 /* warning, self is not the SCA_PythonController, its a PyObjectPlus_Proxy */
-PyObjectSCA_PythonController::sPyGetCurrentController(PyObject *self)
+PyObject *SCA_PythonController::sPyGetCurrentController(PyObject *self)
 {
        if (m_sCurrentController==NULL)
        {
@@ -271,7 +271,7 @@ void SCA_PythonController::ErrorPrint(const char *error_msg)
 }
 
 bool SCA_PythonController::Compile()
-{      
+{
        //printf("py script modified '%s'\n", m_scriptName.Ptr());
        m_bModified= false;
        
@@ -374,7 +374,7 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
        m_sCurrentLogicManager = logicmgr;
        
        PyObject *excdict=              NULL;
-       PyObjectresultobj=    NULL;
+       PyObject *resultobj=    NULL;
        
        switch(m_mode) {
        case SCA_PYEXEC_SCRIPT:
@@ -447,13 +447,13 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
                // This doesn't appear to be needed anymore
                //PyDict_Clear(excdict);
                Py_DECREF(excdict);
-       }       
+       }
        
        m_triggeredSensors.clear();
        m_sCurrentController = NULL;
 }
 
-PyObjectSCA_PythonController::PyActivate(PyObject *value)
+PyObject *SCA_PythonController::PyActivate(PyObject *value)
 {
        if (m_sCurrentController != this) {
                PyErr_SetString(PyExc_SystemError, "Cannot add an actuator from a non-active controller");
@@ -468,7 +468,7 @@ PyObject* SCA_PythonController::PyActivate(PyObject *value)
        Py_RETURN_NONE;
 }
 
-PyObjectSCA_PythonController::PyDeActivate(PyObject *value)
+PyObject *SCA_PythonController::PyDeActivate(PyObject *value)
 {
        if (m_sCurrentController != this) {
                PyErr_SetString(PyExc_SystemError, "Cannot add an actuator from a non-active controller");
@@ -483,7 +483,7 @@ PyObject* SCA_PythonController::PyDeActivate(PyObject *value)
        Py_RETURN_NONE;
 }
 
-PyObjectSCA_PythonController::pyattr_get_script(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_PythonController::pyattr_get_script(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        //SCA_PythonController* self= static_cast<SCA_PythonController*>(static_cast<SCA_IController*>(static_cast<SCA_ILogicBrick*>(static_cast<CValue*>(static_cast<PyObjectPlus*>(self_v)))));
        // static_cast<void *>(dynamic_cast<Derived *>(obj)) - static_cast<void *>(obj)
index ccdb82a..8a72ce6 100644 (file)
@@ -74,7 +74,7 @@ class SCA_PythonController : public SCA_IController
 
        //for debugging
        //virtual       CValue*         AddRef();
-       //virtual int                   Release();                                                                                              // Release a reference to this value (when reference count reaches 0, the value is removed from the heap)
+       //virtual int                   Release();  // Release a reference to this value (when reference count reaches 0, the value is removed from the heap)
 
        SCA_PythonController(SCA_IObject* gameobj, int mode);
        virtual ~SCA_PythonController();
@@ -96,11 +96,11 @@ class SCA_PythonController : public SCA_IController
        void    ErrorPrint(const char *error_msg);
        
 #ifdef WITH_PYTHON
-       static const charsPyGetCurrentController__doc__;
-       static PyObject* sPyGetCurrentController(PyObject* self);
-       static const charsPyAddActiveActuator__doc__;
-       static PyObject* sPyAddActiveActuator(PyObject* self, 
-                                                                                 PyObject* args);
+       static const char *sPyGetCurrentController__doc__;
+       static PyObject   *sPyGetCurrentController(PyObject *self);
+       static const char *sPyAddActiveActuator__doc__;
+       static PyObject   *sPyAddActiveActuator(PyObject *self,
+                                               PyObject *args);
        static SCA_IActuator* LinkedActuatorFromPy(PyObject *value);
 
                
index f83b23f..42cda94 100644 (file)
@@ -58,13 +58,13 @@ SCA_PythonKeyboard::~SCA_PythonKeyboard()
 /* ------------------------------------------------------------------------- */
 
 /* clipboard */
-static PyObject* gPyGetClipboard(PyObject* args, PyObject* kwds)
+static PyObject *gPyGetClipboard(PyObject *args, PyObject *kwds)
 {
        char *buf = (char *)GHOST_getClipboard(0);
        return PyUnicode_FromString(buf?buf:"");
 }
 
-static PyObject* gPySetClipboard(PyObject* args, PyObject* value)
+static PyObject *gPySetClipboard(PyObject *args, PyObject *value)
 {
        char* buf;
        if (!PyArg_ParseTuple(value,"s:setClipboard",&buf))
@@ -109,7 +109,7 @@ PyAttributeDef SCA_PythonKeyboard::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectSCA_PythonKeyboard::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_PythonKeyboard::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_PythonKeyboard* self = static_cast<SCA_PythonKeyboard*>(self_v);
        
@@ -123,7 +123,7 @@ PyObject* SCA_PythonKeyboard::pyattr_get_events(void *self_v, const KX_PYATTRIBU
        return self->m_event_dict;
 }
 
-PyObjectSCA_PythonKeyboard::pyattr_get_active_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_PythonKeyboard::pyattr_get_active_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_PythonKeyboard* self = static_cast<SCA_PythonKeyboard*>(self_v);
 
index df5e46f..aab49bc 100644 (file)
@@ -35,7 +35,7 @@ class SCA_PythonKeyboard : public PyObjectPlus
 private:
        class SCA_IInputDevice *m_keyboard;
 #ifdef WITH_PYTHON
-       PyObjectm_event_dict;
+       PyObject *m_event_dict;
 #endif
 public:
        SCA_PythonKeyboard(class SCA_IInputDevice* keyboard);
index cdbeaba..0806bda 100644 (file)
@@ -90,9 +90,9 @@ PyAttributeDef SCA_PythonMouse::Attributes[] = {
        KX_PYATTRIBUTE_RW_FUNCTION("position", SCA_PythonMouse, pyattr_get_position, pyattr_set_position),
        KX_PYATTRIBUTE_RW_FUNCTION("visible", SCA_PythonMouse, pyattr_get_visible, pyattr_set_visible),
        { NULL }        //Sentinel
-};     
+};
 
-PyObjectSCA_PythonMouse::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_PythonMouse::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_PythonMouse* self = static_cast<SCA_PythonMouse*>(self_v);
        
@@ -106,7 +106,7 @@ PyObject* SCA_PythonMouse::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_
        return self->m_event_dict;
 }
 
-PyObjectSCA_PythonMouse::pyattr_get_active_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_PythonMouse::pyattr_get_active_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_PythonMouse* self = static_cast<SCA_PythonMouse*>(self_v);
 
@@ -123,7 +123,7 @@ PyObject* SCA_PythonMouse::pyattr_get_active_events(void *self_v, const KX_PYATT
        return self->m_event_dict;
 }
 
-PyObjectSCA_PythonMouse::pyattr_get_position(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_PythonMouse::pyattr_get_position(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_PythonMouse* self = static_cast<SCA_PythonMouse*>(self_v);
        const SCA_InputEvent & xevent = self->m_mouse->GetEventValue(SCA_IInputDevice::KX_MOUSEX);
@@ -134,7 +134,7 @@ PyObject* SCA_PythonMouse::pyattr_get_position(void *self_v, const KX_PYATTRIBUT
        x_coord = self->m_canvas->GetMouseNormalizedX(xevent.m_eventval);
        y_coord = self->m_canvas->GetMouseNormalizedY(yevent.m_eventval);
 
-       PyObjectret = PyTuple_New(2);
+       PyObject *ret = PyTuple_New(2);
 
        PyTuple_SET_ITEM(ret, 0, PyFloat_FromDouble(x_coord));
        PyTuple_SET_ITEM(ret, 1, PyFloat_FromDouble(y_coord));
@@ -158,7 +158,7 @@ int SCA_PythonMouse::pyattr_set_position(void *self_v, const KX_PYATTRIBUTE_DEF
        return PY_SET_ATTR_SUCCESS;
 }
 
-PyObjectSCA_PythonMouse::pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_PythonMouse::pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_PythonMouse* self = static_cast<SCA_PythonMouse*>(self_v);
 
index 1313d55..f770a54 100644 (file)
@@ -36,7 +36,7 @@ private:
        class SCA_IInputDevice *m_mouse;
        class RAS_ICanvas *m_canvas;
 #ifdef WITH_PYTHON
-       PyObjectm_event_dict;
+       PyObject *m_event_dict;
 #endif
 public:
        SCA_PythonMouse(class SCA_IInputDevice* mouse, class RAS_ICanvas* canvas);
@@ -47,12 +47,12 @@ public:
 #ifdef WITH_PYTHON
        KX_PYMETHOD_DOC(SCA_PythonMouse, show);
 
-       static PyObject*        pyattr_get_events(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-       static PyObject*        pyattr_get_active_events(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-       static PyObject*        pyattr_get_position(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-       static int                      pyattr_set_position(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject* value);
-       static PyObject*        pyattr_get_visible(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-       static int                      pyattr_set_visible(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject* value);
+       static PyObject *pyattr_get_events(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_active_events(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_position(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static int       pyattr_set_position(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+       static PyObject *pyattr_get_visible(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static int       pyattr_set_visible(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 #endif
 };
 
index c727eeb..9a54c76 100644 (file)
@@ -161,7 +161,7 @@ bool SCA_RandomActuator::Update()
                while (b >= a) {
                        b = b * m_base->DrawFloat();
                        res++;
-               };      
+               };
                tmpval = new CIntValue(res);
        }
        break;
@@ -361,9 +361,9 @@ PyAttributeDef SCA_RandomActuator::Attributes[] = {
        KX_PYATTRIBUTE_STRING_RW_CHECK("propName",0,MAX_PROP_NAME,false,SCA_RandomActuator,m_propname,CheckProperty),
        KX_PYATTRIBUTE_RW_FUNCTION("seed",SCA_RandomActuator,pyattr_get_seed,pyattr_set_seed),
        { NULL }        //Sentinel
-};     
+};
 
-PyObjectSCA_RandomActuator::pyattr_get_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_RandomActuator::pyattr_get_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_RandomActuator* act = static_cast<SCA_RandomActuator*>(self);
        return PyLong_FromSsize_t(act->m_base->GetSeed());
@@ -420,7 +420,7 @@ KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setBoolBernouilli,
        }
        
        m_distribution = KX_RANDOMACT_BOOL_BERNOUILLI;
-       m_parameter1 = paraArg; 
+       m_parameter1 = paraArg;
        enforceConstraints();
        Py_RETURN_NONE;
 }
@@ -473,7 +473,7 @@ KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setIntPoisson,
        }
        
        m_distribution = KX_RANDOMACT_INT_POISSON;
-       m_parameter1 = paraArg; 
+       m_parameter1 = paraArg;
        enforceConstraints();
        Py_RETURN_NONE;
 }
@@ -489,7 +489,7 @@ KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setFloatConst,
        }
        
        m_distribution = KX_RANDOMACT_FLOAT_CONST;
-       m_parameter1 = paraArg; 
+       m_parameter1 = paraArg;
        enforceConstraints();
        Py_RETURN_NONE;
 }
@@ -544,7 +544,7 @@ KX_PYMETHODDEF_DOC_VARARGS(SCA_RandomActuator, setFloatNegativeExponential,
        }
        
        m_distribution = KX_RANDOMACT_FLOAT_NEGATIVE_EXPONENTIAL;
-       m_parameter1 = paraArg; 
+       m_parameter1 = paraArg;
        enforceConstraints();
        Py_RETURN_NONE;
 }
index 5226636..f61de24 100644 (file)
@@ -67,10 +67,10 @@ class SCA_RandomActuator : public SCA_IActuator
                KX_RANDOMACT_NODEF,
                KX_RANDOMACT_BOOL_CONST,
                KX_RANDOMACT_BOOL_UNIFORM,
-               KX_RANDOMACT_BOOL_BERNOUILLI,           
+               KX_RANDOMACT_BOOL_BERNOUILLI,
                KX_RANDOMACT_INT_CONST,
                KX_RANDOMACT_INT_UNIFORM,
-               KX_RANDOMACT_INT_POISSON,               
+               KX_RANDOMACT_INT_POISSON,
                KX_RANDOMACT_FLOAT_CONST,
                KX_RANDOMACT_FLOAT_UNIFORM,
                KX_RANDOMACT_FLOAT_NORMAL,
@@ -98,7 +98,7 @@ class SCA_RandomActuator : public SCA_IActuator
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
 
-       static PyObjectpyattr_get_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int pyattr_set_seed(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
        KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setBoolConst);
index 3b37507..1778475 100644 (file)
@@ -165,7 +165,7 @@ PyAttributeDef SCA_RandomSensor::Attributes[] = {
        {NULL} //Sentinel
 };
 
-PyObjectSCA_RandomSensor::pyattr_get_seed(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *SCA_RandomSensor::pyattr_get_seed(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        SCA_RandomSensor* self= static_cast<SCA_RandomSensor*>(self_v);
        return PyLong_FromSsize_t(self->m_basegenerator->GetSeed());
index e28f00a..e8a6289 100644 (file)
@@ -54,7 +54,7 @@ SCA_TimeEventManager::~SCA_TimeEventManager()
                        !(it == m_timevalues.end()); ++it)
        {
                (*it)->Release();
-       }       
+       }
 }
 
 
index f4224b9..7581484 100644 (file)
@@ -99,7 +99,7 @@ void GPC_Canvas::Resize(int width, int height)
 void GPC_Canvas::EndFrame()
 {
        if (m_bannersEnabled)
-               DrawAllBanners();       
+               DrawAllBanners();
 }
 
 
index 25a50fb..453b950 100644 (file)
@@ -163,7 +163,7 @@ public:
        
        void SetMouseState(RAS_MouseState mousestate)
        {
-               // not yet              
+               // not yet
        }
 
        void SetMousePosition(int x, int y)
@@ -250,7 +250,7 @@ protected:
                int oldWriteMask;
        };
 
-               void                    
+               void
        PushRenderState(
                CanvasRenderState & render_state
        );
index a38bba7..e38a9e3 100644 (file)
@@ -67,7 +67,8 @@ void GPC_MouseDevice::NextFrame()
        for (int mouseevent= KX_BEGINMOUSE; mouseevent< KX_ENDMOUSEBUTTONS; mouseevent++) {
                SCA_InputEvent& oldevent = m_eventStatusTables[previousTable][mouseevent];
                if (oldevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED ||
-                       oldevent.m_status == SCA_InputEvent::KX_ACTIVE) {
+                   oldevent.m_status == SCA_InputEvent::KX_ACTIVE)
+               {
                        m_eventStatusTables[m_currentTable][mouseevent] = oldevent;
                        m_eventStatusTables[m_currentTable][mouseevent].m_status = SCA_InputEvent::KX_ACTIVE;
                }
@@ -76,7 +77,8 @@ void GPC_MouseDevice::NextFrame()
                SCA_InputEvent& oldevent = m_eventStatusTables[previousTable][mousemove];
                m_eventStatusTables[m_currentTable][mousemove] = oldevent;
                if (oldevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED ||
-                       oldevent.m_status == SCA_InputEvent::KX_ACTIVE) {       
+                   oldevent.m_status == SCA_InputEvent::KX_ACTIVE)
+               {
                        m_eventStatusTables[m_currentTable][mousemove].m_status = SCA_InputEvent::KX_JUSTRELEASED;
                }
                else {
index 9f129c1..c0d6654 100644 (file)
@@ -89,7 +89,7 @@ bool GPC_RawImage::Load(
                                        // Put original in upper left corner
 
                                        // Add vertical offset
-                                       dst += offsetY * dstBytesWidth; 
+                                       dst += offsetY * dstBytesWidth;
                                        // Add horizontal offset
                                        dst += offsetX * 4;
                                        for (int row = 0; row < numRows; row++)
index 749e774..9cd6715 100644 (file)
@@ -442,7 +442,7 @@ void GPC_RenderTools::PopMatrix()
 
 int GPC_RenderTools::applyLights(int objectlayer, const MT_Transform& viewmat)
 {
-       // taken from blender source, incompatibility between Blender Object / GameObject       
+       // taken from blender source, incompatibility between Blender Object / GameObject
        KX_Scene* kxscene = (KX_Scene*)m_auxilaryClientInfo;
        float glviewmat[16];
        unsigned int count;
index 4c1c6ae..6f40d13 100644 (file)
@@ -110,7 +110,7 @@ void readBitmapFontVersion0(ImBuf * ibuf, unsigned char * rect, int step)
                
                buffer = (unsigned char*)MEM_mallocN(bytes, "readBitmapFontVersion0:buffer");
                
-               index = 0;      
+               index = 0;
                for (i = 0; i < bytes; i++) {
                        buffer[i] = rect[index];
                        index += step;
index 21de701..40b52c3 100644 (file)
@@ -479,7 +479,7 @@ bool GPG_Application::processEvent(GHOST_IEvent* event)
 
                //                      // first check if we want to exit
                //                      m_exitRequested = m_ketsjiengine->GetExitCode();
-               //                      
+               //
                //                      // kick the engine
                //                      bool renderFrame = m_ketsjiengine->NextFrame();
                //                      if (renderFrame)
@@ -546,7 +546,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
                        return false;
                
                // SYS_WriteCommandLineInt(syshandle, "fixedtime", 0);
-               // SYS_WriteCommandLineInt(syshandle, "vertexarrays",1);                
+               // SYS_WriteCommandLineInt(syshandle, "vertexarrays",1);
                GameData *gm= &m_startScene->gm;
                bool properties = (SYS_GetCommandLineInt(syshandle, "show_properties", 0) != 0);
                bool profile = (SYS_GetCommandLineInt(syshandle, "show_profile", 0) != 0);
@@ -576,7 +576,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
                                
                m_canvas->Init();
                if (gm->flag & GAME_SHOW_MOUSE)
-                       m_canvas->SetMouseState(RAS_ICanvas::MOUSE_NORMAL);                             
+                       m_canvas->SetMouseState(RAS_ICanvas::MOUSE_NORMAL);
 
                m_rendertools = new GPC_RenderTools();
                if (!m_rendertools)
@@ -681,7 +681,7 @@ bool GPG_Application::startEngine(void)
        
        // Temporary hack to disable banner display for NaN approved content.
        /*
-       m_canvas->SetBannerDisplayEnabled(true);        
+       m_canvas->SetBannerDisplayEnabled(true);
        Camera* cam;
        cam = (Camera*)scene->camera->data;
        if (cam) {
@@ -730,7 +730,7 @@ bool GPG_Application::startEngine(void)
                // Set the GameLogic.globalDict from marshal'd data, so we can
                // load new blend files and keep data in GameLogic.globalDict
                loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length);
-#endif         
+#endif
                m_sceneconverter->ConvertScene(
                        startscene,
                        m_rendertools,
index d8b07fd..7500a55 100644 (file)
@@ -57,10 +57,10 @@ extern "C"
 {
 #endif  // __cplusplus
 #include "MEM_guardedalloc.h"
-#include "BKE_blender.h"       
-#include "BKE_global.h"        
-#include "BKE_icons.h" 
-#include "BKE_node.h"  
+#include "BKE_blender.h"
+#include "BKE_global.h"
+#include "BKE_icons.h"
+#include "BKE_node.h"
 #include "BKE_report.h"
 #include "BKE_library.h"
 #include "BLI_threads.h"
@@ -223,7 +223,7 @@ void usage(const char* program, bool isBlenderPlayer)
        printf("       --Optional parameters--\n");
        printf("       angle    = field of view in degrees\n");
        printf("       tilt     = tilt angle in degrees\n");
-       printf("       warpdata = a file to use for warping the image (absolute path)\n");      
+       printf("       warpdata = a file to use for warping the image (absolute path)\n");
        printf("       mode: fisheye                (Fisheye)\n");
        printf("             truncatedfront         (Front-Truncated)\n");
        printf("             truncatedrear          (Rear-Truncated)\n");
@@ -1016,12 +1016,12 @@ int main(int argc, char** argv)
                                                                gpg_nextframestate.app = &app;
                                                                gpg_nextframestate.gs = &gs;
                                                                pynextframestate.state = &gpg_nextframestate;
-                                                               pynextframestate.func = &GPG_PyNextFrame;                       
+                                                               pynextframestate.func = &GPG_PyNextFrame;
 
                                 printf("Yielding control to Python script '%s'...\n", python_main);
                                 PyRun_SimpleString(python_code);
                                 printf("Exit Python script '%s'\n", python_main);
-#endif // WITH_PYTHON                          
+#endif // WITH_PYTHON
                                 MEM_freeN(python_code);
                             }
                             else {
index c0fca88..e0ad153 100644 (file)
@@ -431,7 +431,7 @@ void BL_Shader::SetProg(bool enable)
                        glUseProgramObjectARB(mShader);
                }
                else {
-                       glUseProgramObjectARB(0);       
+                       glUseProgramObjectARB(0);
                }
        }
 }
@@ -613,7 +613,7 @@ void BL_Shader::SetUniform(int uniform, const MT_Tuple3& vec)
                GLEW_ARB_vertex_shader &&
                GLEW_ARB_shader_objects 
                )
-       {       
+       {
                float value[3];
                vec.getValue(value);
                glUniform3fvARB(uniform, 1, value);
@@ -931,7 +931,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform1f, "setUniform1f(name, fx)" )
                {
 #ifdef SORT_UNIFORMS
                        SetUniformfv(loc, BL_Uniform::UNI_FLOAT, &value, sizeof(float));
-#else                  
+#else
                        SetUniform( loc, (float)value );
 #endif
                }
@@ -1142,7 +1142,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv, "setUniformfv( float (list2 or list
 #ifdef SORT_UNIFORMS
                                                SetUniformfv(loc, BL_Uniform::UNI_FLOAT2, array2, sizeof(float)*2);
 #else
-                                               SetUniform(loc, array2, 2);                                             
+                                               SetUniform(loc, array2, 2);
 #endif
                                                Py_RETURN_NONE;
                                        } break;
@@ -1152,7 +1152,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv, "setUniformfv( float (list2 or list
 #ifdef SORT_UNIFORMS
                                                SetUniformfv(loc, BL_Uniform::UNI_FLOAT3, array3, sizeof(float)*3);
 #else
-                                               SetUniform(loc, array3, 3);     
+                                               SetUniform(loc, array3, 3);
 #endif
                                                Py_RETURN_NONE;
                                        }break;
@@ -1162,7 +1162,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv, "setUniformfv( float (list2 or list
 #ifdef SORT_UNIFORMS
                                                SetUniformfv(loc, BL_Uniform::UNI_FLOAT4, array4, sizeof(float)*4);
 #else
-                                               SetUniform(loc, array4, 4);     
+                                               SetUniform(loc, array4, 4);
 #endif
                                                Py_RETURN_NONE;
                                        }break;
@@ -1226,7 +1226,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( uniform_name, (list2
 #ifdef SORT_UNIFORMS
                        SetUniformiv(loc, BL_Uniform::UNI_INT2, array2, sizeof(int)*2);
 #else
-                       SetUniform(loc, array2, 2);                                             
+                       SetUniform(loc, array2, 2);
 #endif
                        Py_RETURN_NONE;
                } break;
@@ -1237,7 +1237,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( uniform_name, (list2
                        SetUniformiv(loc, BL_Uniform::UNI_INT3, array3, sizeof(int)*3);
                        
 #else
-                       SetUniform(loc, array3, 3);     
+                       SetUniform(loc, array3, 3);
 #endif
                        Py_RETURN_NONE;
                }break;
@@ -1248,7 +1248,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( uniform_name, (list2
                        SetUniformiv(loc, BL_Uniform::UNI_INT4, array4, sizeof(int)*4);
                        
 #else
-                       SetUniform(loc, array4, 4);     
+                       SetUniform(loc, array4, 4);
 #endif
                        Py_RETURN_NONE;
                }break;
index 2bb094f..b577a18 100644 (file)
@@ -222,7 +222,7 @@ public:
 
        // Python interface
 #ifdef WITH_PYTHON
-       virtual PyObjectpy_repr(void) { return PyUnicode_FromFormat("BL_Shader\n\tvertex shader:%s\n\n\tfragment shader%s\n\n", vertProg, fragProg); }
+       virtual PyObject *py_repr(void) { return PyUnicode_FromFormat("BL_Shader\n\tvertex shader:%s\n\n\tfragment shader%s\n\n", vertProg, fragProg); }
 
        // -----------------------------------
        KX_PYMETHOD_DOC(BL_Shader, setSource);
index b8cc4eb..7196c1e 100644 (file)
@@ -47,7 +47,7 @@ static int power_of_2_min_i(int num)
 {
        while (!is_power_of_2_i(num))
                num= num&(num-1);
-       return num;     
+       return num;
 }
 
 // Place holder for a full texture manager
@@ -427,7 +427,7 @@ void BL_Texture::DisableAllTextures()
                glMatrixMode(GL_TEXTURE);
                glLoadIdentity();
                glMatrixMode(GL_MODELVIEW);
-               glDisable(GL_TEXTURE_2D);       
+               glDisable(GL_TEXTURE_2D);
                glDisable(GL_TEXTURE_GEN_S);
                glDisable(GL_TEXTURE_GEN_T);
                glDisable(GL_TEXTURE_GEN_R);
@@ -447,14 +447,14 @@ void BL_Texture::ActivateTexture()
 
        if (mType == GL_TEXTURE_CUBE_MAP_ARB && GLEW_ARB_texture_cube_map)
        {
-               glBindTexture( GL_TEXTURE_CUBE_MAP_ARB, mTexture );     
+               glBindTexture( GL_TEXTURE_CUBE_MAP_ARB, mTexture );
                glEnable(GL_TEXTURE_CUBE_MAP_ARB);
        }
        else {
                if (GLEW_ARB_texture_cube_map )
                        glDisable(GL_TEXTURE_CUBE_MAP_ARB);
 
-               glBindTexture( GL_TEXTURE_2D, mTexture );       
+               glBindTexture( GL_TEXTURE_2D, mTexture );
                glEnable(GL_TEXTURE_2D);
        }
 }
@@ -659,7 +659,7 @@ void my_envmap_split_ima(EnvMap *env, ImBuf *ibuf)
 {
        int dx, part;
        
-       my_free_envmapdata(env);        
+       my_free_envmapdata(env);
        
        dx= ibuf->y;
        dx/= 2;
index a69f02b..6260596 100644 (file)
@@ -38,7 +38,7 @@
 #include "NG_NetworkMessage.h"
 #include "NG_NetworkScene.h"
 #include "NG_NetworkObject.h"
-#include "SCA_IObject.h"       
+#include "SCA_IObject.h"
 #include "InputParser.h"
 #include "ListValue.h"
 #include "StringValue.h"
@@ -201,7 +201,7 @@ PyAttributeDef KX_NetworkMessageSensor::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectKX_NetworkMessageSensor::pyattr_get_bodies(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_NetworkMessageSensor::pyattr_get_bodies(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_NetworkMessageSensor *self = static_cast<KX_NetworkMessageSensor*>(self_v);
        if (self->m_BodyList) {
@@ -211,7 +211,7 @@ PyObject* KX_NetworkMessageSensor::pyattr_get_bodies(void *self_v, const KX_PYAT
        }
 }
 
-PyObjectKX_NetworkMessageSensor::pyattr_get_subjects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_NetworkMessageSensor::pyattr_get_subjects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_NetworkMessageSensor *self = static_cast<KX_NetworkMessageSensor*>(self_v);
        if (self->m_SubjectList) {
index 66f723d..6b9779d 100644 (file)
@@ -80,7 +80,7 @@ public:
        /* ------------------------------------------------------------- */
 
        /* attributes */
-       static PyObject*        pyattr_get_bodies(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);     
+       static PyObject*        pyattr_get_bodies(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject*        pyattr_get_subjects(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
 #endif // WITH_PYTHON
index f72d9c1..523f3ce 100644 (file)
@@ -86,7 +86,7 @@ void KX_ArmatureSensor::FindConstraint()
                                                        /* this constraint is not valid, can't use it */
                                                        break;
                                                m_constraint = pcon;
-                                               break;  
+                                               break;
                                        }
                                }
                                break;
@@ -193,13 +193,13 @@ PyAttributeDef KX_ArmatureSensor::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectKX_ArmatureSensor::pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_ArmatureSensor::pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_ArmatureSensor* sensor = static_cast<KX_ArmatureSensor*>(self);
        if (sensor->m_gameobj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE) {
                BL_ArmatureObject* armobj = (BL_ArmatureObject*)sensor->m_gameobj;
                BL_ArmatureConstraint* constraint = armobj->GetConstraint(sensor->m_posechannel, sensor->m_constraintname);
-               if (constraint) 
+               if (constraint)
                        return constraint->GetProxy();
        }
        Py_RETURN_NONE;
index 9c3faa3..74603b3 100644 (file)
@@ -72,7 +72,7 @@ public:
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
-       static PyObjectpyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
 #endif // WITH_PYTHON
 
index b602ba4..2337e95 100644 (file)
@@ -412,7 +412,7 @@ KX_BlenderMaterial::ActivatShaders(
 
                if ((mMaterial->ras_mode &WIRE) ||
                    (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME))
-               {               
+               {
                        if (mMaterial->ras_mode &WIRE) 
                                rasty->SetCullFace(false);
                        rasty->SetLines(true);
@@ -457,7 +457,7 @@ KX_BlenderMaterial::ActivateBlenderShaders(
 
                if ((mMaterial->ras_mode &WIRE) ||
                    (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME))
-               {               
+               {
                        if (mMaterial->ras_mode &WIRE) 
                                rasty->SetCullFace(false);
                        rasty->SetLines(true);
@@ -506,7 +506,7 @@ KX_BlenderMaterial::ActivateMat(
 
                if ((mMaterial->ras_mode &WIRE) ||
                    (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME))
-               {               
+               {
                        if (mMaterial->ras_mode &WIRE) 
                                rasty->SetCullFace(false);
                        rasty->SetLines(true);
@@ -614,7 +614,7 @@ void KX_BlenderMaterial::ActivatGLMaterials( RAS_IRasterizer* rasty )const
                        mMaterial->matcolor[2]*mMaterial->ref+mMaterial->emit,
                        1.0f);
 
-               rasty->SetEmissive(     
+               rasty->SetEmissive(
                        mMaterial->matcolor[0]*mMaterial->emit,
                        mMaterial->matcolor[1]*mMaterial->emit,
                        mMaterial->matcolor[2]*mMaterial->emit,
@@ -835,19 +835,19 @@ PyTypeObject KX_BlenderMaterial::Type = {
        py_base_new
 };
 
-PyObjectKX_BlenderMaterial::pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_BlenderMaterial::pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_BlenderMaterial* self= static_cast<KX_BlenderMaterial*>(self_v);
        return self->PygetShader(NULL, NULL);
 }
 
-PyObjectKX_BlenderMaterial::pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_BlenderMaterial::pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_BlenderMaterial* self= static_cast<KX_BlenderMaterial*>(self_v);
        return PyLong_FromSsize_t(self->GetMaterialIndex());
 }
 
-PyObjectKX_BlenderMaterial::pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_BlenderMaterial::pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_BlenderMaterial* self= static_cast<KX_BlenderMaterial*>(self_v);
        unsigned int* bfunc = self->getBlendFunc();
@@ -857,7 +857,7 @@ PyObject* KX_BlenderMaterial::pyattr_get_blending(void *self_v, const KX_PYATTRI
 int KX_BlenderMaterial::pyattr_set_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
 {
        KX_BlenderMaterial* self= static_cast<KX_BlenderMaterial*>(self_v);
-       PyObjectobj = self->PysetBlending(value, NULL);
+       PyObject *obj = self->PysetBlending(value, NULL);
        if (obj)
        {
                Py_DECREF(obj);
index 8fc86ef..a69f5c9 100644 (file)
@@ -106,11 +106,11 @@ public:
 
 #ifdef WITH_PYTHON
        // --------------------------------
-       virtual PyObjectpy_repr(void) { return PyUnicode_From_STR_String(mMaterial->matname); }
+       virtual PyObject *py_repr(void) { return PyUnicode_From_STR_String(mMaterial->matname); }
 
-       static PyObjectpyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-       static PyObjectpyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-       static PyObjectpyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static int       pyattr_set_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
        KX_PYMETHOD_DOC(KX_BlenderMaterial, getShader);
index b974886..20c41b9 100644 (file)
@@ -269,7 +269,7 @@ void    KX_BulletPhysicsController::AddCompoundChild(KX_IPhysicsController* chil
        rootScale[2] = 1.0/rootScale[2];
        // relative scale = child_scale/parent_scale
        btVector3 relativeScale = childShape->getLocalScaling()*rootScale;
-       btMatrix3x3 rootRotInverse = rootTrans.getBasis().transpose();  
+       btMatrix3x3 rootRotInverse = rootTrans.getBasis().transpose();
        // relative pos = parent_rot^-1 * ((parent_pos-child_pos)/parent_scale)
        btVector3 relativePos = rootRotInverse*((childTrans.getOrigin()-rootTrans.getOrigin())*rootScale);
        // relative rot = parent_rot^-1 * child_rot
index ac17ada..c0071ab 100644 (file)
@@ -67,7 +67,7 @@ KX_Camera::~KX_Camera()
                delete m_pSGNode;
                m_pSGNode = NULL;
        }
-}      
+}
 
 
 CValue*        KX_Camera::GetReplica()
@@ -119,7 +119,7 @@ const MT_Point3 KX_Camera::GetCameraLocation() const
        //MT_Transform trans;
        //trans.setBasis(NodeGetWorldOrientation());
        
-       return NodeGetWorldPosition();          
+       return NodeGetWorldPosition();
 }
 
 
@@ -712,7 +712,7 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_Camera, setOnTop,
        Py_RETURN_NONE;
 }
 
-PyObjectKX_Camera::pyattr_get_perspective(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_perspective(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyBool_FromLong(self->m_camdata.m_perspective);
@@ -732,7 +732,7 @@ int KX_Camera::pyattr_set_perspective(void *self_v, const KX_PYATTRIBUTE_DEF *at
        return PY_SET_ATTR_SUCCESS;
 }
 
-PyObjectKX_Camera::pyattr_get_lens(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_lens(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyFloat_FromDouble(self->m_camdata.m_lens);
@@ -752,7 +752,7 @@ int KX_Camera::pyattr_set_lens(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef,
        return PY_SET_ATTR_SUCCESS;
 }
 
-PyObjectKX_Camera::pyattr_get_ortho_scale(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_ortho_scale(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyFloat_FromDouble(self->m_camdata.m_scale);
@@ -772,7 +772,7 @@ int KX_Camera::pyattr_set_ortho_scale(void *self_v, const KX_PYATTRIBUTE_DEF *at
        return PY_SET_ATTR_SUCCESS;
 }
 
-PyObjectKX_Camera::pyattr_get_near(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_near(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyFloat_FromDouble(self->m_camdata.m_clipstart);
@@ -792,7 +792,7 @@ int KX_Camera::pyattr_set_near(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef,
        return PY_SET_ATTR_SUCCESS;
 }
 
-PyObjectKX_Camera::pyattr_get_far(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_far(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyFloat_FromDouble(self->m_camdata.m_clipend);
@@ -813,7 +813,7 @@ int KX_Camera::pyattr_set_far(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, P
 }
 
 
-PyObjectKX_Camera::pyattr_get_use_viewport(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_use_viewport(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyBool_FromLong(self->GetViewport());
@@ -832,7 +832,7 @@ int KX_Camera::pyattr_set_use_viewport(void *self_v, const KX_PYATTRIBUTE_DEF *a
 }
 
 
-PyObjectKX_Camera::pyattr_get_projection_matrix(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_projection_matrix(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyObjectFrom(self->GetProjectionMatrix()); 
@@ -849,34 +849,34 @@ int KX_Camera::pyattr_set_projection_matrix(void *self_v, const KX_PYATTRIBUTE_D
        return PY_SET_ATTR_SUCCESS;
 }
 
-PyObjectKX_Camera::pyattr_get_modelview_matrix(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_modelview_matrix(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyObjectFrom(self->GetModelviewMatrix()); 
 }
 
-PyObjectKX_Camera::pyattr_get_camera_to_world(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_camera_to_world(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyObjectFrom(self->GetCameraToWorld());
 }
 
-PyObjectKX_Camera::pyattr_get_world_to_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_world_to_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Camera* self= static_cast<KX_Camera*>(self_v);
        return PyObjectFrom(self->GetWorldToCamera()); 
 }
 
 
-PyObjectKX_Camera::pyattr_get_INSIDE(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_INSIDE(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {      return PyLong_FromSsize_t(INSIDE); }
-PyObjectKX_Camera::pyattr_get_OUTSIDE(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_OUTSIDE(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {      return PyLong_FromSsize_t(OUTSIDE); }
-PyObjectKX_Camera::pyattr_get_INTERSECT(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_Camera::pyattr_get_INTERSECT(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {      return PyLong_FromSsize_t(INTERSECT); }
 
 
-bool ConvertPythonToCamera(PyObject * value, KX_Camera **object, bool py_none_ok, const char *error_prefix)
+bool ConvertPythonToCamera(PyObject *value, KX_Camera **object, bool py_none_ok, const char *error_prefix)
 {
        if (value==NULL) {
                PyErr_Format(PyExc_TypeError, "%s, python pointer NULL, should never happen", error_prefix);
@@ -976,7 +976,7 @@ KX_PYMETHODDEF_DOC_O(KX_Camera, getScreenPosition,
 
        vect[1] = 1.0 - vect[1]; //to follow Blender window coordinate system (Top-Down)
 
-       PyObjectret = PyTuple_New(2);
+       PyObject *ret = PyTuple_New(2);
        if (ret) {
                PyTuple_SET_ITEM(ret, 0, PyFloat_FromDouble(vect[0]));
                PyTuple_SET_ITEM(ret, 1, PyFloat_FromDouble(vect[1]));
@@ -1040,7 +1040,7 @@ KX_PYMETHODDEF_DOC_VARARGS(KX_Camera, getScreenRay,
        if (!PyArg_ParseTuple(args,"ddd|s:getScreenRay",&x,&y,&dist,&propName))
                return NULL;
 
-       PyObjectargValue = PyTuple_New(2);
+       PyObject *argValue = PyTuple_New(2);
        PyTuple_SET_ITEM(argValue, 0, PyFloat_FromDouble(x));
        PyTuple_SET_ITEM(argValue, 1, PyFloat_FromDouble(y));
 
@@ -1065,7 +1065,7 @@ KX_PYMETHODDEF_DOC_VARARGS(KX_Camera, getScreenRay,
                if (propName)
                        PyTuple_SET_ITEM(argValue, 2, PyUnicode_FromString(propName));
 
-               PyObjectret= this->PyrayCastTo(argValue,NULL);
+               PyObject *ret= this->PyrayCastTo(argValue,NULL);
                Py_DECREF(argValue);
                return ret;
        }
index 7481b2e..d95d10e 100644 (file)
@@ -45,7 +45,7 @@
 
 #ifdef WITH_PYTHON
 /* utility conversion function */
-bool ConvertPythonToCamera(PyObject * value, KX_Camera **object, bool py_none_ok, const char *error_prefix);
+bool ConvertPythonToCamera(PyObject *value, KX_Camera **object, bool py_none_ok, const char *error_prefix);
 #endif
 
 class KX_Camera : public KX_GameObject
@@ -156,7 +156,7 @@ public:
         * instance allocated on the heap. Ownership of the new 
         * object belongs with the caller.
         */
-       virtual CValue*                         
+       virtual CValue*
        GetReplica(
        );
        virtual void ProcessReplica();
@@ -286,8 +286,8 @@ public:
        KX_PYMETHOD_DOC_NOARGS(KX_Camera, getCameraToWorld);
        KX_PYMETHOD_DOC_NOARGS(KX_Camera, getWorldToCamera);
        
-       KX_PYMETHOD_DOC_VARARGS(KX_Camera, setViewport);        
-       KX_PYMETHOD_DOC_NOARGS(KX_Camera, setOnTop);    
+       KX_PYMETHOD_DOC_VARARGS(KX_Camera, setViewport);
+       KX_PYMETHOD_DOC_NOARGS(KX_Camera, setOnTop);
 
        KX_PYMETHOD_DOC_O(KX_Camera, getScreenPosition);
        KX_PYMETHOD_DOC_VARARGS(KX_Camera, getScreenVect);
index 4c63afa..9ca1ec5 100644 (file)
@@ -394,7 +394,7 @@ PyAttributeDef KX_CameraActuator::Attributes[] = {
        {NULL}
 };
 
-PyObjectKX_CameraActuator::pyattr_get_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_CameraActuator::pyattr_get_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_CameraActuator* self= static_cast<KX_CameraActuator*>(self_v);
        if (self->m_ob==NULL)
@@ -412,7 +412,7 @@ int KX_CameraActuator::pyattr_set_object(void *self_v, const KX_PYATTRIBUTE_DEF
                return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error
        
        if (self->m_ob)
-               self->m_ob->UnregisterActuator(self);   
+               self->m_ob->UnregisterActuator(self);
 
        if ((self->m_ob = (SCA_IObject*)gameobj))
                self->m_ob->RegisterActuator(self);
index 0605876..9b7c1ed 100644 (file)
@@ -77,13 +77,13 @@ public:
                m_ipotime = time;
                m_modified = true;
        }
-       void    SetModifyLens(bool modify) {    
+       void    SetModifyLens(bool modify) {
                m_modify_lens = modify;
        }
-       void    SetModifyClipEnd(bool modify) { 
+       void    SetModifyClipEnd(bool modify) {
                m_modify_clipend = modify;
        }
-       void    SetModifyClipStart(bool modify) {       
+       void    SetModifyClipStart(bool modify) {
                m_modify_clipstart = modify;
        }
        void    AddInterpolator(KX_IInterpolator* interp);
index 322d6e6..3caa4d3 100644 (file)
@@ -166,7 +166,7 @@ bool KX_ConstraintActuator::NeedRayCast(KX_ClientObjectInfo* client)
 bool KX_ConstraintActuator::Update(double curtime, bool frame)
 {
 
-       bool result = false;    
+       bool result = false;
        bool bNegativeEvent = IsNegativeEvent();
        RemoveAllEvents();
 
@@ -462,7 +462,7 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
                                // we expect a hit object
                                if (!m_hitObject)
                                        result = false;
-                               if (result)     
+                               if (result)
                                {
                                        MT_Vector3 newnormal = callback.m_hitNormal;
                                        // compute new position & orientation
@@ -619,7 +619,7 @@ int KX_ConstraintActuator::pyattr_check_direction(void *self, const struct KX_PY
                return 1;
        }
        act->m_refDirVector = dir/len;
-       return 0;       
+       return 0;
 }
 
 #endif
index f491aed..786e4ff 100644 (file)
@@ -43,7 +43,7 @@ class KX_GameObject;
 class KX_ConstraintActuator : public SCA_IActuator
 {
        Py_Header
-protected:     
+protected:
        // Damp time (int),
        int m_posDampTime;
        int m_rotDampTime;
index df6b089..5727ed2 100644 (file)
@@ -50,13 +50,13 @@ KX_ConstraintWrapper::~KX_ConstraintWrapper()
 
 #ifdef WITH_PYTHON
 
-PyObjectKX_ConstraintWrapper::PyGetConstraintId()
+PyObject *KX_ConstraintWrapper::PyGetConstraintId()
 {
        return PyLong_FromSsize_t(m_constraintId);
 }
 
 
-PyObject* KX_ConstraintWrapper::PyGetParam(PyObject* args, PyObject* kwds)
+PyObject *KX_ConstraintWrapper::PyGetParam(PyObject *args, PyObject *kwds)
 {
        int dof;
        float value;
@@ -69,7 +69,7 @@ PyObject* KX_ConstraintWrapper::PyGetParam(PyObject* args, PyObject* kwds)
        
 }
 
-PyObject* KX_ConstraintWrapper::PySetParam(PyObject* args, PyObject* kwds)
+PyObject *KX_ConstraintWrapper::PySetParam(PyObject *args, PyObject *kwds)
 {
        int dof;
        float minLimit,maxLimit;
@@ -117,7 +117,7 @@ PyAttributeDef KX_ConstraintWrapper::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObjectKX_ConstraintWrapper::pyattr_get_constraintId(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_ConstraintWrapper::pyattr_get_constraintId(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_ConstraintWrapper* self= static_cast<KX_ConstraintWrapper*>(self_v);
        return self->PyGetConstraintId();
index a92ae83..dbc3571 100644 (file)
@@ -48,7 +48,7 @@ public:
        KX_PYMETHOD(KX_ConstraintWrapper,SetParam);
        KX_PYMETHOD(KX_ConstraintWrapper,GetParam);
 
-       static PyObjectpyattr_get_constraintId(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject *pyattr_get_constraintId(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 #endif
 
 private:
index f1038c0..7769532 100644 (file)
@@ -282,7 +282,7 @@ void        KX_ConvertBulletObject( class   KX_GameObject* gameobj,
                        relativeRot.getValue(rot);
                        shapeInfo->m_childTrans.getBasis().setFromOpenGLSubMatrix(rot);
 
-                       parentShapeInfo->AddShape(shapeInfo);   
+                       parentShapeInfo->AddShape(shapeInfo);
                        compoundShape->addChildShape(shapeInfo->m_childTrans,bm);
                        //do some recalc?
                        //recalc inertia for rigidbody
@@ -439,7 +439,7 @@ void        KX_ConvertBulletObject( class   KX_GameObject* gameobj,
        {
                env->addCcdPhysicsController( physicscontroller);
        }
-       physicscontroller->setNewClientInfo(gameobj->getClientInfo());          
+       physicscontroller->setNewClientInfo(gameobj->getClientInfo());
        {
                btRigidBody* rbody = physicscontroller->GetRigidBody();
 
index 44c9cb1..fd3a18a 100644 (file)
@@ -592,7 +592,7 @@ void KX_Dome::CreateMeshDome180(void)
        cubebottom[0].u[2] = 0.0;
        cubebottom[0].v[2] = 0.0;
 
-       nfacesbottom = 1;       
+       nfacesbottom = 1;
        
        /* Left face - two triangles */
        
@@ -682,12 +682,12 @@ void KX_Dome::CreateMeshDome180(void)
                cubetop.resize(4*nfacestop);
                SplitFace(cubetop,&nfacestop);
                cubebottom.resize(4*nfacesbottom);
-               SplitFace(cubebottom,&nfacesbottom);    
+               SplitFace(cubebottom,&nfacesbottom);
                cubeleft.resize(4*nfacesleft);
                SplitFace(cubeleft,&nfacesleft);
                cuberight.resize(4*nfacesright);
                SplitFace(cuberight,&nfacesright);
-       }               
+       }
 
        // Turn into a hemisphere
        for (j=0;j<3;j++) {
@@ -763,13 +763,13 @@ void KX_Dome::CreateMeshDome250(void)
 
        cubefront[0].verts[1][0] = 1.0;
        cubefront[0].verts[1][1] = 1.0;
-       cubefront[0].verts[1][2] = 1.0; 
+       cubefront[0].verts[1][2] = 1.0;
        cubefront[0].u[1] = uv_ratio;
        cubefront[0].v[1] = uv_ratio;
 
        cubefront[0].verts[2][0] =-1.0;
        cubefront[0].verts[2][1] = 1.0;
-       cubefront[0].verts[2][2] = 1.0; 
+       cubefront[0].verts[2][2] = 1.0;
        cubefront[0].u[2] = 0.0;
        cubefront[0].v[2] = uv_ratio;
 
@@ -782,13 +782,13 @@ void KX_Dome::CreateMeshDome250(void)
 
        cubefront[1].verts[1][0] =-1.0;
        cubefront[1].verts[1][1] = 1.0;
-       cubefront[1].verts[1][2] =-1.0; 
+       cubefront[1].verts[1][2] =-1.0;
        cubefront[1].u[1] = 0.0;
        cubefront[1].v[1] = 0.0;
 
        cubefront[1].verts[2][0] = 1.0;
        cubefront[1].verts[2][1] = 1.0;
-       cubefront[1].verts[2][2] =-1.0; 
+       cubefront[1].verts[2][2] =-1.0;
        cubefront[1].u[2] = uv_ratio;
        cubefront[1].v[2] = 0.0;
 
@@ -803,13 +803,13 @@ void KX_Dome::CreateMeshDome250(void)
 
        cubeleft[0].verts[1][0] =-1.0;
        cubeleft[0].verts[1][1] =-verts_height;
-       cubeleft[0].verts[1][2] = 1.0;  
+       cubeleft[0].verts[1][2] = 1.0;
        cubeleft[0].u[1] = uv_base;
        cubeleft[0].v[1] = uv_ratio;
 
        cubeleft[0].verts[2][0] =-1.0;
        cubeleft[0].verts[2][1] =-verts_height;
-       cubeleft[0].verts[2][2] =-1.0;  
+       cubeleft[0].verts[2][2] =-1.0;
        cubeleft[0].u[2] = uv_base;
        cubeleft[0].v[2] = 0.0;
 
@@ -822,13 +822,13 @@ void KX_Dome::CreateMeshDome250(void)
 
        cubeleft[1].verts[1][0] =-1.0;
        cubeleft[1].verts[1][1] = 1.0;
-       cubeleft[1].verts[1][2] =-1.0;  
+       cubeleft[1].verts[1][2] =-1.0;
        cubeleft[1].u[1] = uv_ratio;