blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Campbell Barton 2022-11-08 17:00:46 +11:00
parent fddcdcc20c 642ff82f74
commit 8b151982fe
6 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/modules/rna_info.py
View File

@ -286,7 +286,10 @@ class InfoPropertyRNA:
self.enum_pointer = 0
if self.type == "enum":
items = tuple(rna_prop.enum_items)
# WARNING: don't convert to a tuple as this causes dynamically allocated enums to access freed memory
# since freeing the iterator may free the memory used to store the internal `EnumPropertyItem` array.
# To support this properly RNA would have to support owning the dynamically allocated memory.
items = rna_prop.enum_items
items_static = tuple(rna_prop.enum_items_static)
self.enum_items[:] = [(item.identifier, item.name, item.description) for item in items]
self.is_enum_flag = rna_prop.is_enum_flag
@ -295,6 +298,7 @@ class InfoPropertyRNA:
item = (items_static or items)
if item:
self.enum_pointer = item[0].as_pointer()
del items, items_static, item
else:
self.is_enum_flag = False

3
source/blender/blenkernel/intern/displist.cc
View File

@ -533,7 +533,8 @@ static ModifierData *curve_get_tessellate_point(const Scene *scene,
}
if (md->type == eModifierType_Smooth) {
/* Smooth modifier works with mesh edges explicitly (so needs tesselation, thus cannnot work on control points). */
/* Smooth modifier works with mesh edges explicitly
* (so needs tessellation, thus cannot work on control points). */
md->mode &= ~eModifierMode_ApplyOnSpline;
return pretessellatePoint;
}

2
source/blender/editors/object/object_remesh.cc
View File

@ -286,7 +286,7 @@ static void voxel_size_parallel_lines_draw(uint pos3d,
immEnd();
}
static void voxel_size_edit_draw(const bContext *C, ARegion * /*ar*/, void *arg)
static void voxel_size_edit_draw(const bContext *C, ARegion * /*region*/, void *arg)
{
VoxelSizeEditCustomData *cd = static_cast<VoxelSizeEditCustomData *>(arg);

9
source/blender/makesrna/intern/rna_color.c
View File

@ -577,15 +577,8 @@ static void rna_ColorManagedColorspaceSettings_colorspace_set(struct PointerRNA
}
static const EnumPropertyItem *rna_ColorManagedColorspaceSettings_colorspace_itemf(
bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
{
# if 0 /* FIXME: Causes blank drop-down, see T102316. */
if (C == NULL) {
return rna_enum_color_space_convert_default_items;
}
# else
UNUSED_VARS(C);
# endif
EnumPropertyItem *items = NULL;
int totitem = 0;

9
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -4512,15 +4512,8 @@ static void rna_NodeConvertColorSpace_to_color_space_set(struct PointerRNA *ptr,
}
static const EnumPropertyItem *rna_NodeConvertColorSpace_color_space_itemf(
bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
{
# if 0 /* FIXME: Causes blank drop-down, see T102316. */
if (C == NULL) {
return rna_enum_color_space_convert_default_items;
}
# else
UNUSED_VARS(C);
# endif
EnumPropertyItem *items = NULL;
int totitem = 0;

3
source/blender/modifiers/intern/MOD_ui_common.c
View File

@ -352,7 +352,8 @@ static void modifier_panel_header(const bContext *C, Panel *panel)
buttons_number++;
}
/* Some modifiers can work with pre-tessellated curves only. */
else if (ELEM(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) {
else if (ELEM(
md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) {
/* Add button (appearing to be ON) and add tip why this can't be changed. */
sub = uiLayoutRow(row, true);
uiBlock *block = uiLayoutGetBlock(sub);