diff options
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index dcc005d190a..465768f1efa 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -912,6 +912,10 @@ static void drw_engines_enable_from_engine(RenderEngineType *engine_type, int dr } break; + case OB_CLAY: + use_drw_engine(&draw_engine_clay_type); + break; + case OB_TEXTURE: case OB_MATERIAL: case OB_RENDER: diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 0f9cbc06fa8..9c25da12da7 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -442,6 +442,7 @@ enum { OB_MATERIAL = 4, OB_TEXTURE = 5, OB_RENDER = 6, + OB_CLAY = 7, }; /* dtx: flags (short) */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 3c02b60140a..7d5745c423e 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -176,6 +176,7 @@ static const EnumPropertyItem autosnap_items[] = { const EnumPropertyItem rna_enum_viewport_shade_items[] = { {OB_WIRE, "WIREFRAME", ICON_WIRE, "Wireframe", "Display the object as wire edges"}, {OB_SOLID, "SOLID", ICON_SOLID, "Solid", "Display the object solid"}, + {OB_CLAY, "MATCAP", ICON_SOLID, "Clay", "Display using Clay"}, {OB_TEXTURE, "TEXTURED", ICON_POTATO, "Texture", "Display the object solid, with a texture"}, {OB_MATERIAL, "MATERIAL", ICON_MATERIAL_DATA, "Material", "Display objects solid, with GLSL material"}, {OB_RENDER, "RENDERED", ICON_SMOOTH, "Rendered", "Display render preview"}, @@ -691,6 +692,7 @@ static const EnumPropertyItem *rna_SpaceView3D_viewport_shade_itemf( int totitem = 0; RNA_enum_items_add_value(&item, &totitem, rna_enum_viewport_shade_items, OB_SOLID); + RNA_enum_items_add_value(&item, &totitem, rna_enum_viewport_shade_items, OB_CLAY); if (BKE_scene_uses_blender_eevee(scene)) { RNA_enum_items_add_value(&item, &totitem, rna_enum_viewport_shade_items, OB_RENDER); |