[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20702] branches/blender2.5/blender: 2. 5 Preview render

[Thomas Dinges]

Revision: 20702
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20702
Author:   dingto
Date:     2009-06-07 13:42:13 +0200 (Sun, 07 Jun 2009)

Log Message:
-----------
2.5 Preview render

* Added Preview panel to the lamp buttons. 

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_data_lamp.py
    branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c

Modified: branches/blender2.5/blender/release/ui/buttons_data_lamp.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lamp.py	2009-06-07 11:37:15 UTC (rev 20701)
+++ branches/blender2.5/blender/release/ui/buttons_data_lamp.py	2009-06-07 11:42:13 UTC (rev 20702)
@@ -8,6 +8,16 @@
 	
 	def poll(self, context):
 		return (context.lamp != None)
+		
+class DATA_PT_preview(DataButtonsPanel):
+	__idname__= "DATA_PT_preview"
+	__label__ = "Preview"
+
+	def draw(self, context):
+		layout = self.layout
+
+		lamp = context.lamp
+		layout.template_preview(lamp)
 	
 class DATA_PT_lamp(DataButtonsPanel):
 	__idname__ = "DATA_PT_lamp"
@@ -218,9 +228,9 @@
 
 		layout.template_curve_mapping(lamp.falloff_curve)
 
+bpy.types.register(DATA_PT_preview)
 bpy.types.register(DATA_PT_lamp)
 bpy.types.register(DATA_PT_shadow)
 bpy.types.register(DATA_PT_sunsky)
 bpy.types.register(DATA_PT_spot)
-bpy.types.register(DATA_PT_falloff_curve)
-
+bpy.types.register(DATA_PT_falloff_curve)
\ No newline at end of file

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c	2009-06-07 11:37:15 UTC (rev 20701)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c	2009-06-07 11:42:13 UTC (rev 20702)
@@ -1294,8 +1294,8 @@
 	uiBlock *block;
 	Material *ma;
 
-	if(!id || !ELEM3(GS(id->name), ID_MA, ID_TE, ID_WO)) {
-		printf("uiTemplatePreview: expected ID of type material, texture or world.\n");
+	if(!id || !ELEM4(GS(id->name), ID_MA, ID_TE, ID_WO, ID_LA)) {
+		printf("uiTemplatePreview: expected ID of type material, texture, lamp or world.\n");
 		return;
 	}