griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v3.4-release'

Browse Source
This commit is contained in:
Sergey Sharybin
2022-11-08 12:03:07 +01:00
parent f12236d1e3 0d945fe20e
commit c047042adf
32 changed files with 154 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/python/bmesh/bmesh_py_types.c
View File

@@ -7,6 +7,7 @@
#include "BLI_math.h"
#include "BLI_sort.h"
#include "BLI_string.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
@@ -4246,16 +4247,16 @@ char *BPy_BMElem_StringFromHType_ex(const char htype, char ret[32])
/* zero to ensure string is always NULL terminated */
char *ret_ptr = ret;
if (htype & BM_VERT) {
ret_ptr += sprintf(ret_ptr, "/%s", BPy_BMVert_Type.tp_name);
ret_ptr += BLI_sprintf(ret_ptr, "/%s", BPy_BMVert_Type.tp_name);
}
if (htype & BM_EDGE) {
ret_ptr += sprintf(ret_ptr, "/%s", BPy_BMEdge_Type.tp_name);
ret_ptr += BLI_sprintf(ret_ptr, "/%s", BPy_BMEdge_Type.tp_name);
}
if (htype & BM_FACE) {
ret_ptr += sprintf(ret_ptr, "/%s", BPy_BMFace_Type.tp_name);
ret_ptr += BLI_sprintf(ret_ptr, "/%s", BPy_BMFace_Type.tp_name);
}
if (htype & BM_LOOP) {
ret_ptr += sprintf(ret_ptr, "/%s", BPy_BMLoop_Type.tp_name);
ret_ptr += BLI_sprintf(ret_ptr, "/%s", BPy_BMLoop_Type.tp_name);
}
ret[0] = '(';
*ret_ptr++ = ')';

2
source/blender/python/intern/bpy_rna.c
View File

@@ -993,7 +993,7 @@ static PyObject *pyrna_prop_str(BPy_PropertyRNA *self)
}
if (len != -1) {
sprintf(--c, "[%d]", len);
BLI_sprintf(--c, "[%d]", len);
}
/* If a pointer, try to print name of pointer target too. */