blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Campbell Barton 2022-11-07 21:33:24 +11:00
parent 74140d41b1 186f16e84c
commit 129197f20d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -579,9 +579,13 @@ 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)
{
# 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;

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

@ -4502,9 +4502,13 @@ 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)
{
# 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;