forked from bartvdbraak/blender
use PyUnicode_From_STR_String in the game engine in more places.
This commit is contained in:
parent
c52f780021
commit
424e09a2ce
@ -43,7 +43,7 @@ public:
|
|||||||
virtual CValue* GetReplica();
|
virtual CValue* GetReplica();
|
||||||
#ifdef WITH_PYTHON
|
#ifdef WITH_PYTHON
|
||||||
virtual PyObject* ConvertValueToPython() {
|
virtual PyObject* ConvertValueToPython() {
|
||||||
return PyUnicode_FromString(m_strString.Ptr());
|
return PyUnicode_From_STR_String(m_strString);
|
||||||
}
|
}
|
||||||
#endif // WITH_PYTHON
|
#endif // WITH_PYTHON
|
||||||
|
|
||||||
|
@ -221,7 +221,7 @@ public:
|
|||||||
//static PyObject* PyMake(PyObject*,PyObject*);
|
//static PyObject* PyMake(PyObject*,PyObject*);
|
||||||
virtual PyObject *py_repr(void)
|
virtual PyObject *py_repr(void)
|
||||||
{
|
{
|
||||||
return PyUnicode_FromString((const char*)GetText());
|
return PyUnicode_From_STR_String(GetText());
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual PyObject* ConvertValueToPython() {
|
virtual PyObject* ConvertValueToPython() {
|
||||||
|
@ -106,7 +106,7 @@ public:
|
|||||||
|
|
||||||
#ifdef WITH_PYTHON
|
#ifdef WITH_PYTHON
|
||||||
// --------------------------------
|
// --------------------------------
|
||||||
virtual PyObject* py_repr(void) { return PyUnicode_FromString(mMaterial->matname.ReadPtr()); }
|
virtual PyObject* py_repr(void) { return PyUnicode_From_STR_String(mMaterial->matname); }
|
||||||
|
|
||||||
static PyObject* pyattr_get_shader(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_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
|
||||||
|
@ -215,7 +215,7 @@ PyObject* KX_FontObject::pyattr_get_text(void *self_v, const KX_PYATTRIBUTE_DEF
|
|||||||
str += '\n';
|
str += '\n';
|
||||||
str += self->m_text[i];
|
str += self->m_text[i];
|
||||||
}
|
}
|
||||||
return PyUnicode_FromString(str.ReadPtr());
|
return PyUnicode_From_STR_String(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
int KX_FontObject::pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
|
int KX_FontObject::pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
|
||||||
|
@ -888,7 +888,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual PyObject* py_repr(void)
|
virtual PyObject* py_repr(void)
|
||||||
{
|
{
|
||||||
return PyUnicode_FromString(GetName().ReadPtr());
|
return PyUnicode_From_STR_String(GetName());
|
||||||
}
|
}
|
||||||
|
|
||||||
KX_PYMETHOD_O(KX_GameObject,SetWorldPosition);
|
KX_PYMETHOD_O(KX_GameObject,SetWorldPosition);
|
||||||
|
@ -617,7 +617,7 @@ public:
|
|||||||
static PyObject* pyattr_get_drawing_callback_post(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
|
static PyObject* pyattr_get_drawing_callback_post(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
|
||||||
static int pyattr_set_drawing_callback_post(void *selv_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
|
static int pyattr_set_drawing_callback_post(void *selv_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
|
||||||
|
|
||||||
virtual PyObject* py_repr(void) { return PyUnicode_FromString(GetName().ReadPtr()); }
|
virtual PyObject* py_repr(void) { return PyUnicode_From_STR_String(GetName()); }
|
||||||
|
|
||||||
/* getitem/setitem */
|
/* getitem/setitem */
|
||||||
static PyMappingMethods Mapping;
|
static PyMappingMethods Mapping;
|
||||||
|
Loading…
Reference in New Issue
Block a user