diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 05:39:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 05:39:36 +0400 |
commit | 4c17f8e5de94f3abc65995e7a2964bb9e6ea7642 (patch) | |
tree | 001add4dd98c14818079e5f591d584c5ece7ac6a /source/gameengine/Converter | |
parent | 2a7ade9de24860bbd13e4be8480e9285d1f3fe4c (diff) |
PyUnicode_From_STR_String utility function which passes STR_String to PyUnicode_FromStringAndSize (saves a call to strlen).
Also made CValue::ConvertKeysToPython use faster list creation and improved some of the macro formatting.
Diffstat (limited to 'source/gameengine/Converter')
5 files changed, 7 insertions, 7 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h index 2fb774dad44..29300281bb5 100644 --- a/source/gameengine/Converter/BL_ActionActuator.h +++ b/source/gameengine/Converter/BL_ActionActuator.h @@ -40,7 +40,7 @@ class BL_ActionActuator : public SCA_IActuator { public: - Py_Header; + Py_Header BL_ActionActuator(SCA_IObject* gameobj, const STR_String& propname, const STR_String& framepropname, @@ -70,8 +70,8 @@ public: #ifdef WITH_PYTHON - KX_PYMETHOD_O(BL_ActionActuator,GetChannel); - KX_PYMETHOD_DOC(BL_ActionActuator,setChannel); + KX_PYMETHOD_O(BL_ActionActuator,GetChannel) + KX_PYMETHOD_DOC(BL_ActionActuator,setChannel) static PyObject* pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); diff --git a/source/gameengine/Converter/BL_ArmatureActuator.h b/source/gameengine/Converter/BL_ArmatureActuator.h index 8390444613c..344b76ec278 100644 --- a/source/gameengine/Converter/BL_ArmatureActuator.h +++ b/source/gameengine/Converter/BL_ArmatureActuator.h @@ -46,7 +46,7 @@ class BL_ArmatureActuator : public SCA_IActuator { - Py_Header; + Py_Header public: BL_ArmatureActuator(SCA_IObject* gameobj, int type, diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.h b/source/gameengine/Converter/BL_ArmatureConstraint.h index 49a331e78a5..2abb36ff937 100644 --- a/source/gameengine/Converter/BL_ArmatureConstraint.h +++ b/source/gameengine/Converter/BL_ArmatureConstraint.h @@ -52,7 +52,7 @@ struct bPose; */ class BL_ArmatureConstraint : public PyObjectPlus { - Py_Header; + Py_Header private: struct bConstraint* m_constraint; diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h index 9847558f708..745ffac0cb2 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.h +++ b/source/gameengine/Converter/BL_ArmatureObject.h @@ -51,7 +51,7 @@ class KX_BlenderSceneConverter; class BL_ArmatureObject : public KX_GameObject { - Py_Header; + Py_Header public: double GetLastFrame (); diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h index c4251b3c503..90f44acb672 100644 --- a/source/gameengine/Converter/BL_ShapeActionActuator.h +++ b/source/gameengine/Converter/BL_ShapeActionActuator.h @@ -42,7 +42,7 @@ struct Key; class BL_ShapeActionActuator : public SCA_IActuator { public: - Py_Header; + Py_Header BL_ShapeActionActuator(SCA_IObject* gameobj, const STR_String& propname, const STR_String& framepropname, |