[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28364] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix [#21582] Adjusting material color (color picker) crashes

[Matt Ebb]

Revision: 28364
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28364
Author:   broken
Date:     2010-04-23 03:41:01 +0200 (Fri, 23 Apr 2010)

Log Message:
-----------
Fix [#21582] Adjusting material color (color picker) crashes

Thanks to the testers for helping diagnose this!

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-04-23 01:06:28 UTC (rev 28363)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-04-23 01:41:01 UTC (rev 28364)
@@ -2944,6 +2944,8 @@
 		if (color_profile)
 			hsv[2] = srgb_to_linearrgb(hsv[2]);
 		
+		if (hsv[2] > but->softmax)
+			hsv[2] = but->softmax;
 	}
 
 	hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2);