diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-27 00:35:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-27 00:35:44 +0300 |
| commit | 11e95fcdd292f4f0c4dfcb05616c181aa9789fd9 (patch) | |
| tree | 833ad8118e1b3a9749c6df364d7faec49ae3ac4e /source/gameengine | |
| parent | 48e8a1a1670101a38db5aa10970c4aa938bc9451 (diff) | |
| parent | 5c963128ea2435375dbfcc0319e9d49df06881c5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_FontObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index 364f8d4bfc6..91e8e4fd42b 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -281,7 +281,7 @@ int KX_FontObject::pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrd KX_FontObject* self = static_cast<KX_FontObject*>(self_v); if (!PyUnicode_Check(value)) return PY_SET_ATTR_FAIL; - char* chars = _PyUnicode_AsString(value); + const char *chars = _PyUnicode_AsString(value); /* Allow for some logic brick control */ CValue* tprop = self->GetProperty("Text"); |