Cycles:

* Sun, area and point lights with size now supported
* Cast shadow option to disable shadow casting for lamps
* Emission strength of materials tweaked such that setting strength to 1.0
  basically makes the material "shadeless" in that the value of the color
  input will be the resulting color in the image.

1 files changed, 4 insertions, 9 deletions

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 6f31732aa1f..d8f776b0114 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -366,8 +366,7 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        return False
-        #return context.lamp and CyclesButtonsPanel.poll(context)
+        return context.lamp and CyclesButtonsPanel.poll(context)
 
     def draw(self, context):
         layout = self.layout
@@ -505,17 +504,13 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
         mat = context.material
         cmat = mat.cycles
 
-        layout.prop(mat, "diffuse_color", text="Viewport Color")
-
-        """
         split = layout.split()
-    
+
         col = split.column()
-        col.prop(cmat, "sample_as_light")
+        col.prop(mat, "diffuse_color", text="Viewport Color")
 
         col = split.column()
-        col.prop(cmat, "homogeneous_volume")
-        """
+        col.prop(cmat, "sample_as_light")
 
 class CyclesTexture_PT_context(CyclesButtonsPanel, Panel):
     bl_label = ""