diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-14 19:20:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-14 19:20:25 +0300 |
commit | 4057626e55e3c1e78d6725c54160b059580f1dd1 (patch) | |
tree | 848276be21979001f631e3a6a801a38db84f8596 | |
parent | 2dc61df9eac381042af2b9a675ac645ee88449dc (diff) |
- revert own recent change after discussion, default set hard minimum of colors to 0 but now don't set a hard min, each property needs to define.
- use_old_bump setting only applies to material texture slots.
-rw-r--r-- | release/scripts/ui/properties_texture.py | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 5e200a45eb8..b343035b29a 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -988,8 +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") + if isinstance(idblock, bpy.types.Material): + # 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") diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index b061fbccd37..214a79dbd34 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -887,8 +887,6 @@ PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier fprop->hardmax= FLT_MAX; if(ELEM(subtype, PROP_COLOR, PROP_COLOR_GAMMA)) { - fprop->hardmin= 0.0f; /* disallow colors to go below zero */ - fprop->softmin= 0.0f; fprop->softmax= 1.0f; } |