diff options
author | Campbell Barton <campbell@blender.org> | 2022-11-07 13:33:24 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-11-07 13:33:24 +0300 |
commit | 129197f20d3c2e6e105e6312dafee9a4b1e1d2e7 (patch) | |
tree | 6b1c89c83918d0e191143382bcde370bda902056 | |
parent | 74140d41b1dc8e447658ca77a061fc7d9a47052c (diff) | |
parent | 186f16e84c500bc49bb8e73fdb92766ea7f95a7e (diff) |
Merge branch 'blender-v3.4-release'
-rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 4 |
2 files changed, 8 insertions, 0 deletions
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; |