diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-11-22 22:21:18 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-11-22 22:21:18 +0300 |
| commit | b9d9df9810c6b66584b36186876e9da08709c84a (patch) | |
| tree | 6155ebce362f03b082b0c4518b9ffd72f1757d19 /intern | |
| parent | 25c5542fe78abe79cdf9d2ec46607de01762f32e (diff) | |
Cycles UI: Several fixes for recent additions...
* Alpha Property was removed (Fix T42690)
* Some tweaks to make the panel look better again.
* Use abreviated form "Multiple Importance" everywhere, for consistency.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index bce98df8d40..9b1e20d3c8f 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -733,7 +733,7 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel): col = split.column() col.prop(clamp, "cast_shadow") - col.prop(clamp, "use_multiple_importance_sampling") + col.prop(clamp, "use_multiple_importance_sampling", text="Multiple Importance") if lamp.type == 'HEMI': layout.label(text="Not supported, interpreted as sun lamp") @@ -1021,8 +1021,8 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel): split = layout.split() col = split.column() - col.prop(mat, "pass_index") - col.prop(cmat, "sample_as_light") + col.label(text="Surface:") + col.prop(cmat, "sample_as_light", text="Multiple Importance") col.prop(cmat, "use_transparent_shadow") col = split.column() @@ -1034,19 +1034,20 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel): 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 = split.column(align=True) + col.label("Viewport Color:") col.prop(mat, "diffuse_color", text="") + col.prop(mat, "alpha") + + col.separator() + col.prop(mat, "pass_index") + + col = split.column(align=True) + col.label("Viewport Specular:") col.prop(mat, "specular_color", text="") - col.prop(mat, "specular_hardness", text="") + col.prop(mat, "specular_hardness", text="Hardness") class CyclesTexture_PT_context(CyclesButtonsPanel, Panel): |