[Bf-blender-cvs] [19d651ca9a6] blender2.8: View3DShading popover: Naming + alignment

[Jeroen Bakker]

Commit: 19d651ca9a694f556c76a09c2822b81ae1dc18a5
Author: Jeroen Bakker
Date:   Wed Jun 6 16:16:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB19d651ca9a694f556c76a09c2822b81ae1dc18a5

View3DShading popover: Naming + alignment

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/makesrna/intern/rna_space.c

===================================================================

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}
 };