[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33565] trunk/blender/release/scripts/ui/ properties_texture.py: bugfix [#25104] Identical material settings render differently

[Campbell Barton]

Revision: 33565
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33565
Author:   campbellbarton
Date:     2010-12-09 04:22:03 +0100 (Thu, 09 Dec 2010)

Log Message:
-----------
bugfix [#25104] Identical material settings render differently
- Use Old Bump option wasn't available.
- noise_intensity wasn't visible for MULTIFRACTAL musgrave textures.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_texture.py

Modified: trunk/blender/release/scripts/ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_texture.py	2010-12-09 01:05:06 UTC (rev 33564)
+++ trunk/blender/release/scripts/ui/properties_texture.py	2010-12-09 03:22:03 UTC (rev 33565)
@@ -547,12 +547,14 @@
         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')):
+        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")
-            col.prop(tex, "noise_intensity", text="Intensity")
 
         layout.label(text="Noise:")
 
@@ -986,6 +988,9 @@
         # 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")