Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-05-30 21:34:29 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-05-30 21:34:29 +0300
commitf5f25b843ee0edd559187abcfaf4fefbf1901d86 (patch)
tree4403ffa0d00b47c1e106f1c7c1813c71cd441586 /source/blender/makesrna
parenteb0fcd4574aaac732045058dce71a17f6900384c (diff)
Removed Object color from workbench. Added Highlights to FLAT shading.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_space.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 71f647b7009..4c7b5b3f0a6 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2249,8 +2249,7 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna)
static const EnumPropertyItem color_type_items[] = {
{V3D_SHADING_SINGLE_COLOR, "SINGLE", 0, "Single", "Show scene in a single color"},
- {V3D_SHADING_OBJECT_COLOR, "OBJECT", 0, "Object", "Show Object color"},
- {V3D_SHADING_MATERIAL_COLOR, "MATERIAL", 0, "Material", "Show Material color"},
+ {V3D_SHADING_MATERIAL_COLOR, "MATERIAL", 0, "Material", "Show material color"},
{V3D_SHADING_RANDOM_COLOR, "RANDOM", 0, "Random", "Show random object color"},
{0, NULL, 0, NULL, NULL}
};