From f0b72a776ed888da798b41ce43995f7b5ac11ec0 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 11 Jul 2019 14:13:22 +0200 Subject: Fix T66706: crash in viewport shading popover for workbench engine Differential Revision: https://developer.blender.org/D5226 --- source/blender/makesrna/intern/rna_space.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'source/blender') diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 1c76753fb1b..2ba5e2ae68c 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1067,11 +1067,7 @@ static const EnumPropertyItem *rna_View3DShading_color_type_itemf(bContext *UNUS int totitem = 0; - if (shading->type == OB_SOLID) { - r_free = false; - return rna_enum_shading_color_type_items; - } - else if (shading->type == OB_WIRE) { + if (shading->type == OB_WIRE) { EnumPropertyItem *item = NULL; RNA_enum_items_add_value( &item, &totitem, rna_enum_shading_color_type_items, V3D_SHADING_SINGLE_COLOR); @@ -1084,8 +1080,9 @@ static const EnumPropertyItem *rna_View3DShading_color_type_itemf(bContext *UNUS return item; } else { - *r_free = false; - return NULL; + /* Solid mode, or lookdev mode for workbench engine. */ + r_free = false; + return rna_enum_shading_color_type_items; } } -- cgit v1.2.3