From 19d651ca9a694f556c76a09c2822b81ae1dc18a5 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 6 Jun 2018 16:16:06 +0200 Subject: View3DShading popover: Naming + alignment --- release/scripts/startup/bl_ui/space_view3d.py | 2 +- source/blender/makesrna/intern/rna_space.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 03446254a89..c1793d95245 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3535,7 +3535,7 @@ class VIEW3D_PT_shading(Panel): row = col.split(0.4) row.active = not shading.show_xray row.prop(shading, "show_cavity") - sub = row.column() + sub = row.column(align=True) sub.active = not shading.show_xray and shading.show_cavity sub.prop(shading, "cavity_ridge_factor") sub.prop(shading, "cavity_valley_factor") diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 3c9484cc390..185c9a38098 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -194,9 +194,9 @@ const EnumPropertyItem rna_enum_shading_type_items[] = { }; const EnumPropertyItem rna_enum_viewport_lighting_items[] = { - {V3D_LIGHTING_FLAT, "FLAT", 0, "Flat Lighting", "Display using flat lighting"}, - {V3D_LIGHTING_STUDIO, "STUDIO", 0, "Studio Lighting", "Display using studio lighting"}, - {V3D_LIGHTING_MATCAP, "MATCAP", 0, "Matcap", "Display using matcap material and lighting"}, + {V3D_LIGHTING_FLAT, "FLAT", 0, "Flat", "Display using flat lighting"}, + {V3D_LIGHTING_STUDIO, "STUDIO", 0, "Studio", "Display using studio lighting"}, + {V3D_LIGHTING_MATCAP, "MATCAP", 0, "MatCap", "Display using matcap material and lighting"}, {0, NULL, 0, NULL, NULL} }; -- cgit v1.2.3