diff options
| author | Thomas Dinges <blender@dingto.org> | 2011-08-02 22:56:03 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2011-08-02 22:56:03 +0400 |
| commit | 4fc56e39bdc381bc45af6da13df7d09d10e4156f (patch) | |
| tree | 675b3be10f572d65c61043baeba71800c5d611d6 /release | |
| parent | 5c36b753242be5830764ee41e2f6db4ae776f30a (diff) | |
Patch by oenvoyage - olivier amrein, thanks a lot!
* Material Diffuse Ramp was not greyed out when shadeless was enabled.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_material.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index 2a52ae23782..296c05d78f5 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -247,15 +247,17 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel, bpy.types.Panel): row.prop(mat, "diffuse_fresnel_factor", text="Factor") if mat.use_diffuse_ramp: - layout.separator() - layout.template_color_ramp(mat, "diffuse_ramp", expand=True) - layout.separator() + col = layout.column() + col.active = (not mat.use_shadeless) + col.separator() + col.template_color_ramp(mat, "diffuse_ramp", expand=True) + col.separator() - row = layout.row() + row = col.row() row.prop(mat, "diffuse_ramp_input", text="Input") row.prop(mat, "diffuse_ramp_blend", text="Blend") - layout.prop(mat, "diffuse_ramp_factor", text="Factor") + col.prop(mat, "diffuse_ramp_factor", text="Factor") class MATERIAL_PT_specular(MaterialButtonsPanel, bpy.types.Panel): |