Revision: 22015
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22015
Author:   broken
Date:     2009-07-29 16:17:15 +0200 (Wed, 29 Jul 2009)

Log Message:
-----------
* a few more small lamp panels tweaks

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_data_lamp.py

Modified: branches/blender2.5/blender/release/ui/buttons_data_lamp.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-07-29 
14:07:51 UTC (rev 22014)
+++ branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-07-29 
14:17:15 UTC (rev 22015)
@@ -52,39 +52,41 @@
                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 @@
                                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"


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to