* Restored the "Solid OpenGL lamps" Buttons in user Preferences.

1 files changed, 37 insertions, 6 deletions

diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py
index e9f49665062..34669e14859 100644
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/ui/space_userpref.py
@@ -119,11 +119,11 @@ class USERPREF_PT_interface(bpy.types.Panel):
         sub1 = sub.column()
 
 #Toolbox doesn't exist yet
-#		sub1.label(text="Toolbox:")
-#		sub1.prop(view, "use_column_layout")
-#		sub1.label(text="Open Toolbox Delay:")
-#		sub1.prop(view, "open_left_mouse_delay", text="Hold LMB")
-#		sub1.prop(view, "open_right_mouse_delay", text="Hold RMB")
+#       sub1.label(text="Toolbox:")
+#       sub1.prop(view, "use_column_layout")
+#       sub1.label(text="Open Toolbox Delay:")
+#       sub1.prop(view, "open_left_mouse_delay", text="Hold LMB")
+#       sub1.prop(view, "open_right_mouse_delay", text="Hold RMB")
 
         #manipulator
         sub1.prop(view, "use_manipulator")
@@ -264,6 +264,9 @@ class USERPREF_PT_system(bpy.types.Panel):
 
         userpref = context.user_preferences
         system = userpref.system
+        lamp0 = system.solid_lights[0]
+        lamp1 = system.solid_lights[1]
+        lamp2 = system.solid_lights[2]
 
         split = layout.split()
 
@@ -321,6 +324,34 @@ class USERPREF_PT_system(bpy.types.Panel):
 
         sub1 = sub.column()
 
+        sub1.label(text="Solid OpenGL lights:")
+
+        sub2 = sub1.split()
+
+        col = sub2.column()
+        col.prop(lamp0, "enabled")
+        sub = col.column()
+        sub.active = lamp0.enabled
+        sub.prop(lamp0, "diffuse_color")
+        sub.prop(lamp0, "specular_color")
+        sub.prop(lamp0, "direction")
+
+        col = sub2.column()
+        col.prop(lamp1, "enabled")
+        sub = col.column()
+        sub.active = lamp1.enabled
+        sub.prop(lamp1, "diffuse_color")
+        sub.prop(lamp1, "specular_color")
+        sub.prop(lamp1, "direction")
+
+        col = sub2.column()
+        col.prop(lamp2, "enabled")
+        sub = col.column()
+        sub.active = lamp2.enabled
+        sub.prop(lamp2, "diffuse_color")
+        sub.prop(lamp2, "specular_color")
+        sub.prop(lamp2, "direction")
+
         sub1.label(text="OpenGL:")
         sub1.prop(system, "clip_alpha", slider=True)
         sub1.prop(system, "use_mipmaps")
@@ -1434,4 +1465,4 @@ bpy.ops.add(WM_OT_keyconfig_export)
 bpy.ops.add(WM_OT_keymap_edit)
 bpy.ops.add(WM_OT_keymap_restore)
 bpy.ops.add(WM_OT_keyitem_add)
-bpy.ops.add(WM_OT_keyitem_remove)
+bpy.ops.add(WM_OT_keyitem_remove)
\ No newline at end of file