diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-11 16:50:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-11 16:50:43 +0300 |
| commit | 06312c6d2db8a6d959bed153f76a28f9faf866f8 (patch) | |
| tree | 0c0e419621bf295ca18133d84eb6d35897584d7d /source/blender/makesrna/intern/rna_space.c | |
| parent | 3fe0c32fae20be4146bfa20fe64f56f5716a132b (diff) | |
| parent | 7ad21c3876c2453f11fd509a0157639d615567fc (diff) | |
Merge branch 'master' into blender-v2.80-releasev2.80-rc1
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 11 |
1 files changed, 4 insertions, 7 deletions
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; } } |