Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-06 05:39:36 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-06 05:39:36 +0400
commit4c17f8e5de94f3abc65995e7a2964bb9e6ea7642 (patch)
tree001add4dd98c14818079e5f591d584c5ece7ac6a /source/gameengine/Ketsji/KX_MeshProxy.cpp
parent2a7ade9de24860bbd13e4be8480e9285d1f3fe4c (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/Ketsji/KX_MeshProxy.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_MeshProxy.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp
index 754ad511669..fec1d9d296c 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.cpp
+++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp
@@ -129,7 +129,7 @@ PyObject* KX_MeshProxy::PyGetMaterialName(PyObject* args, PyObject* kwds)
return NULL;
}
- return PyUnicode_FromString(matname.Ptr());
+ return PyUnicode_From_STR_String(matname);
}
@@ -147,7 +147,7 @@ PyObject* KX_MeshProxy::PyGetTextureName(PyObject* args, PyObject* kwds)
return NULL;
}
- return PyUnicode_FromString(matname.Ptr());
+ return PyUnicode_From_STR_String(matname);
}