From 186f16e84c500bc49bb8e73fdb92766ea7f95a7e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 Nov 2022 21:27:27 +1100 Subject: Fix T102316: blank color-space menu drop-downs Regression in [0] needs further investigation (building docs may crash again). This effectively reverts [0], however de-duplicating the color-space enum can be kept. [0]: 037b771e1af53b0f87b73a9fe01e8e660267ec81 --- source/blender/makesrna/intern/rna_color.c | 4 ++++ source/blender/makesrna/intern/rna_nodetree.c | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'source') diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 061ddc034b0..fe4d51bafb9 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -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; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 4460a8c8830..3ec8d909b9b 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -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; -- cgit v1.2.3