kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bugfix [#25104] Identical material settings render differently

Browse Source 
- Use Old Bump option wasn't available.
- noise_intensity wasn't visible for MULTIFRACTAL musgrave textures.
This commit is contained in:
Campbell Barton 2010-12-09 03:22:03 +00:00
parent 3209077caf
commit 36175f37c9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
release/scripts/ui/properties_texture.py
View File

@ -547,12 +547,14 @@ class TEXTURE_PT_musgrave(TextureTypePanel, bpy.types.Panel):
col.prop(tex, "lacunarity") col.prop(tex, "lacunarity")
col.prop(tex, "octaves") col.prop(tex, "octaves")
musgrave_type = tex.musgrave_type
col = split.column() 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") col.prop(tex, "offset")
if (tex.musgrave_type in ('RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL')): if musgrave_type in ('MULTIFRACTAL', 'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL'):
col.prop(tex, "gain")
col.prop(tex, "noise_intensity", text="Intensity") col.prop(tex, "noise_intensity", text="Intensity")
if musgrave_type in ('RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL'):
col.prop(tex, "gain")
layout.label(text="Noise:") 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. # color is used on grayscale textures even when use_rgb_to_intensity is disabled.
col.prop(tex, "color", text="") 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 = split.column()
col.prop(tex, "invert", text="Negative") col.prop(tex, "invert", text="Negative")
col.prop(tex, "use_stencil") col.prop(tex, "use_stencil")