From 36175f37c9d3ea128cfdcebd1c1b438494b34433 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 9 Dec 2010 03:22:03 +0000 Subject: [PATCH] bugfix [#25104] Identical material settings render differently - Use Old Bump option wasn't available. - noise_intensity wasn't visible for MULTIFRACTAL musgrave textures. --- release/scripts/ui/properties_texture.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index c51a9034bf7..5e200a45eb8 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -547,12 +547,14 @@ class TEXTURE_PT_musgrave(TextureTypePanel, bpy.types.Panel): col.prop(tex, "lacunarity") col.prop(tex, "octaves") + musgrave_type = tex.musgrave_type col = split.column() - if (tex.musgrave_type in ('HETERO_TERRAIN', 'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL')): + if musgrave_type in ('HETERO_TERRAIN', 'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL'): col.prop(tex, "offset") - if (tex.musgrave_type in ('RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL')): - col.prop(tex, "gain") + if musgrave_type in ('MULTIFRACTAL', 'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL'): col.prop(tex, "noise_intensity", text="Intensity") + if musgrave_type in ('RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL'): + col.prop(tex, "gain") layout.label(text="Noise:") @@ -986,6 +988,9 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): # color is used on grayscale textures even when use_rgb_to_intensity is disabled. col.prop(tex, "color", text="") + # XXX, dont remove since old files have this users need to be able to disable! + col.prop(tex, "use_old_bump", text="Old Bump Mapping") + col = split.column() col.prop(tex, "invert", text="Negative") col.prop(tex, "use_stencil")