[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33662] trunk/blender: - 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.

[Campbell Barton]

Revision: 33662
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33662
Author:   campbellbarton
Date:     2010-12-14 17:20:25 +0100 (Tue, 14 Dec 2010)

Log Message:
-----------
- 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.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_texture.py
    trunk/blender/source/blender/makesrna/intern/rna_define.c

Modified: trunk/blender/release/scripts/ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_texture.py	2010-12-14 15:49:36 UTC (rev 33661)
+++ trunk/blender/release/scripts/ui/properties_texture.py	2010-12-14 16:20:25 UTC (rev 33662)
@@ -988,8 +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")
+        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")

Modified: trunk/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_define.c	2010-12-14 15:49:36 UTC (rev 33661)
+++ trunk/blender/source/blender/makesrna/intern/rna_define.c	2010-12-14 16:20:25 UTC (rev 33662)
@@ -887,8 +887,6 @@
 			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;
 			}