Cycles: support for specular color in solid shading mode, available in

the material panel.

Patch by Phillipp Oeser (D62) with some minor modifications, thanks!

1 files changed, 17 insertions, 13 deletions

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index e4f34f3a5aa..bce98df8d40 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1020,20 +1020,9 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
         cmat = mat.cycles
 
         split = layout.split()
-
-        col = split.column(align=True)
-        col.prop(mat, "diffuse_color", text="Viewport Color")
-        col.prop(mat, "alpha")
-
-        col = split.column(align=True)
-        col.label()
-        col.prop(mat, "pass_index")
-
-        split = layout.split()
-
         col = split.column()
-        col.label(text="Surface:")
-        col.prop(cmat, "sample_as_light", text="Multiple Importance")
+        col.prop(mat, "pass_index")
+        col.prop(cmat, "sample_as_light")
         col.prop(cmat, "use_transparent_shadow")
 
         col = split.column()
@@ -1044,6 +1033,21 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
         col.prop(cmat, "volume_interpolation", text="")
         col.prop(cmat, "homogeneous_volume", text="Homogeneous")
 
+        layout.separator()
+        layout.label("Viewport Shading:")
+
+        split = layout.split()
+
+        col = split.column()
+        col.label("Diffuse")
+        col.label("Specular")
+        col.label("Hardness")
+
+        col = split.column()
+        col.prop(mat, "diffuse_color", text="")
+        col.prop(mat, "specular_color", text="")
+        col.prop(mat, "specular_hardness", text="")
+
 
 class CyclesTexture_PT_context(CyclesButtonsPanel, Panel):
     bl_label = ""