Cycles / UI:

* Some tweaks to the material "Settings" panel. 

3 files changed, 7 insertions, 5 deletions

diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index e1015fa3cee..b451b8ef3bf 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -21,7 +21,7 @@
 bl_info = {
     "name": "Cycles Render Engine",
     "author": "",
-    "blender": (2, 66, 0),
+    "blender": (2, 67, 0),
     "location": "Info header, render engine menu",
     "description": "Cycles Render Engine integration",
     "warning": "",
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index b94dd32fad0..ca49ffccd2a 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -506,7 +506,7 @@ class CyclesMaterialSettings(bpy.types.PropertyGroup):
                 )
         cls.use_transparent_shadow = BoolProperty(
                 name="Transparent Shadows",
-                description="Use transparent shadows for this material if it contains a Transparent BSDF"
+                description="Use transparent shadows for this material if it contains a Transparent BSDF, "
                             "disabling will render faster but not give accurate shadows",
                 default=True,
                 )
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index e9f8a4f0a8d..273b099a99d 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -917,12 +917,14 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
         col = split.column()
         col.prop(mat, "diffuse_color", text="Viewport Color")
 
-        col = split.column()
+        col = split.column(align=True)
+        col.label()
         col.prop(mat, "pass_index")
+        
+        col = layout.column()
+        col.prop(cmat, "sample_as_light")
         col.prop(cmat, "use_transparent_shadow")
 
-        layout.prop(cmat, "sample_as_light")
-
 
 class CyclesTexture_PT_context(CyclesButtonsPanel, Panel):
     bl_label = ""