[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14749] trunk/blender/source/blender/nodes /intern:

[Brecht Van Lommel]

Revision: 14749
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14749
Author:   blendix
Date:     2008-05-08 21:57:10 +0200 (Thu, 08 May 2008)

Log Message:
-----------

Fix for bug #11005: hue-sat-value node was doing unnecessary
clamping, which not only is suboptimal for working with hdr
images, it was also doing the clamping incorrect.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
    trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c	2008-05-08 19:16:40 UTC (rev 14748)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c	2008-05-08 19:57:10 UTC (rev 14749)
@@ -52,9 +52,7 @@
 		hsv[0]+= (nhs->hue - 0.5f);
 		if(hsv[0]>1.0) hsv[0]-=1.0; else if(hsv[0]<0.0) hsv[0]+= 1.0;
 		hsv[1]*= nhs->sat;
-		if(hsv[1]>1.0) hsv[1]= 1.0; else if(hsv[1]<0.0) hsv[1]= 0.0;
 		hsv[2]*= nhs->val;
-		if(hsv[2]>1.0) hsv[2]= 1.0; else if(hsv[2]<0.0) hsv[2]= 0.0;
 		hsv_to_rgb(hsv[0], hsv[1], hsv[2], col, col+1, col+2);
 		
 		out[0]= mfac*in[0] + *fac*col[0];

Modified: trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c	2008-05-08 19:16:40 UTC (rev 14748)
+++ trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c	2008-05-08 19:57:10 UTC (rev 14749)
@@ -54,9 +54,7 @@
 		hsv[0]+= (*hue - 0.5f);
 		if(hsv[0]>1.0) hsv[0]-=1.0; else if(hsv[0]<0.0) hsv[0]+= 1.0;
 		hsv[1]*= *sat;
-		if(hsv[1]>1.0) hsv[1]= 1.0; else if(hsv[1]<0.0) hsv[1]= 0.0;
 		hsv[2]*= *val;
-		if(hsv[2]>1.0) hsv[2]= 1.0; else if(hsv[2]<0.0) hsv[2]= 0.0;
 		hsv_to_rgb(hsv[0], hsv[1], hsv[2], col, col+1, col+2);
 		
 		out[0]= mfac*in[0] + *fac*col[0];