archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v3.6-release'

Browse Source
This commit is contained in:
Campbell Barton
2023-05-19 12:53:53 +10:00
parent 8ad2ee7f12 bb543620ae
commit 6fbad2ce7e
9 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/python/intern/bpy_rna_types_capi.c
View File

@@ -111,7 +111,8 @@ PyDoc_STRVAR(pyrna_WindowManager_clipboard_doc, "Clipboard text storage.\n\n:typ
static PyObject *pyrna_WindowManager_clipboard_get(PyObject *UNUSED(self), void *UNUSED(flag))
{
int text_len = 0;
char *text = WM_clipboard_text_get(false, &text_len);
/* No need for UTF8 validation as #PyC_UnicodeFromBytesAndSize handles invalid byte sequences. */
char *text = WM_clipboard_text_get(false, false, &text_len);
PyObject *result = PyC_UnicodeFromBytesAndSize(text ? text : "", text_len);
if (text != NULL) {
MEM_freeN(text);