* a few more small lamp panels tweaks

1 files changed, 27 insertions, 22 deletions

diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py
index dbc00ec0c39..5be25278e93 100644
--- a/release/ui/buttons_data_lamp.py
+++ b/release/ui/buttons_data_lamp.py
@@ -52,39 +52,41 @@ class DATA_PT_lamp(DataButtonsPanel):
 		sub = col.column()
 		sub.itemR(lamp, "color", text="")
 		sub.itemR(lamp, "energy")
-		col.itemR(lamp, "negative")
 		
-		if lamp.type == "AREA":
-			col.itemR(lamp, "distance")
 	
-		col = split.column()
-		col.itemR(lamp, "layer", text="This Layer Only")
-		col.itemR(lamp, "specular")
-		col.itemR(lamp, "diffuse")
 		
-		split = layout.split()
+		
+		#split = layout.split()
 		
 		if lamp.type in ('POINT', 'SPOT'):
-			col = split.column()
-			col.itemL(text="Falloff:")
+			#col = split.column()
+			#col.itemL(text="Falloff:")
 			sub = col.column()
-			sub.itemR(lamp, "falloff_type", text="")
+			sub.itemR(lamp, "falloff_type", text="Falloff")
 			sub.itemR(lamp, "distance")
-			col.itemR(lamp, "sphere")
+			
 			
 			if lamp.falloff_type == 'LINEAR_QUADRATIC_WEIGHTED':
-				col = split.column()
-				col.itemL(text="Attenuation Distance:")
+				#col = split.column()
+				col.itemL(text="Attenuation Factors:")
 				sub = col.column(align=True)
 				sub.itemR(lamp, "linear_attenuation", slider=True, text="Linear")
 				sub.itemR(lamp, "quadratic_attenuation", slider=True, text="Quadratic")
-			else:
-				split.column()
+			#else:
+				# 
+				# split.column()
+			
+			col.itemR(lamp, "sphere")
 			
 		if lamp.type == 'AREA':
-			col = split.column()
-			col.itemL(text="Shape:")
-			col.itemR(lamp, "shape", text="")
+			#col = split.column()
+			col.itemR(lamp, "distance")
+			col.itemR(lamp, "gamma")
+
+			#col = split.column()
+			
+			
+			col.itemR(lamp, "shape")
 			sub = col.column(align=True)
 			if (lamp.shape == 'SQUARE'):
 				sub.itemR(lamp, "size")
@@ -92,9 +94,12 @@ class DATA_PT_lamp(DataButtonsPanel):
 				sub.itemR(lamp, "size", text="Size X")
 				sub.itemR(lamp, "size_y", text="Size Y")
 			
-			col = split.column()
-			col.itemL(text="Gamma:")
-			col.itemR(lamp, "gamma", text="Value")
+		col = split.column()
+		col.itemR(lamp, "negative")
+		col.itemR(lamp, "layer", text="This Layer Only")
+		col.itemR(lamp, "specular")
+		col.itemR(lamp, "diffuse")	
+			
 
 class DATA_PT_sunsky(DataButtonsPanel):
 	__label__ = "Sun/Sky"