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>2018-01-15 07:59:59 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-15 07:59:59 +0300
commit129196dc32b9e67c7008a3b31ce6e2154f9811da (patch)
treeb74e634538aeb21131fcef732d08bbdb2a6fea1d /source/blender/python
parent82a94d0f848ba7adcd5c68dc0796623697c74ad1 (diff)
parentec52e64a5df7da7637c912d79734b236049e6761 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
-rw-r--r--source/blender/python/intern/bpy_rna.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index fdad3a7d919..9675db2a5de 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -1751,10 +1751,8 @@ static int pyrna_py_to_prop(
return -1;
}
else {
- /* same as unicode */
- /* XXX, this is suspect but needed for function calls, need to see if theres a better way */
if (data) *((char **)data) = (char *)param;
- else RNA_property_string_set(ptr, prop, param);
+ else RNA_property_string_set_bytes(ptr, prop, param, PyBytes_Size(value));
}
}
else {