[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20206] branches/blender2.5/blender: 2.5:

[Thomas Dinges]

Revision: 20206
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20206
Author:   dingto
Date:     2009-05-14 21:41:45 +0200 (Thu, 14 May 2009)

Log Message:
-----------
2.5:

* Renamed Local Lamp to Point Lamp, as discussed in IRC.
* Small layout changes to the lamp panel. 

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_data_lamp.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c

Modified: branches/blender2.5/blender/release/ui/buttons_data_lamp.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lamp.py	2009-05-14 19:18:00 UTC (rev 20205)
+++ branches/blender2.5/blender/release/ui/buttons_data_lamp.py	2009-05-14 19:41:45 UTC (rev 20206)
@@ -28,26 +28,18 @@
 		
 		sub = layout.sub(0)
 		sub.column()
-		sub.itemL(text="LAMP DATABLOCKS")
 		sub.itemR(lamp, "energy")
 		sub.itemR(lamp, "distance")
+		sub.itemR(lamp, "negative")
+		sub.itemR(lamp, "color")
 	
 		sub = layout.sub(1)
 		sub.column()
-		sub.itemR(lamp, "color")
-		
-		layout.split(number=2)	
-		
-		sub = layout.sub(0)
-		sub.column()
-		sub.itemL(text="Illumination:")
-		sub.itemR(lamp, "layer")
-		sub.itemR(lamp, "negative")
+		sub.itemR(lamp, "layer", text="This Layer Only")
 		sub.itemR(lamp, "specular")
 		sub.itemR(lamp, "diffuse")
 		
-		sub = layout.sub(1)
-		if (lamp.type in ('LOCAL', 'SPOT')):
+		if (lamp.type in ('POINT', 'SPOT')):
 			sub.column()
 			sub.itemR(lamp, "falloff_type")
 			sub.itemR(lamp, "sphere")
@@ -121,7 +113,7 @@
 	def poll(self, context):
 		ob = context.active_object
 		lamp = context.main.lamps[0]
-		return (ob.type == 'LAMP' and lamp.type in ('LOCAL','SUN', 'SPOT', 'AREA'))
+		return (ob.type == 'LAMP' and lamp.type in ('POINT','SUN', 'SPOT', 'AREA'))
 
 	def draw(self, context):
 		lamp = context.main.lamps[0]
@@ -153,7 +145,7 @@
 			layout.itemL(text="Sampling:")
 			layout.itemR(lamp, "shadow_ray_sampling_method", expand=True)
 				
-			if (lamp.type in ('LOCAL', 'SUN', 'SPOT') and lamp.shadow_ray_sampling_method in ('CONSTANT_QMC', 'ADAPTIVE_QMC')):
+			if (lamp.type in ('POINT', 'SUN', 'SPOT') and lamp.shadow_ray_sampling_method in ('CONSTANT_QMC', 'ADAPTIVE_QMC')):
 				layout.column_flow()
 				layout.itemR(lamp, "shadow_soft_size", text="Soft Size")
 				layout.itemR(lamp, "shadow_ray_samples", text="Samples")

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c	2009-05-14 19:18:00 UTC (rev 20205)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c	2009-05-14 19:41:45 UTC (rev 20206)
@@ -252,7 +252,7 @@
 	PropertyRNA *prop;
 
 	static EnumPropertyItem prop_type_items[] = {
-		{LA_LOCAL, "LOCAL", "Local", "Omnidirectional point light source."},
+		{LA_LOCAL, "POINT", "Point", "Omnidirectional point light source."},
 		{LA_SUN, "SUN", "Sun", "Constant direction parallel ray light source."},
 		{LA_SPOT, "SPOT", "Spot", "Directional cone light source."},
 		{LA_HEMI, "HEMI", "Hemi", "180 degree constant light source."},