[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44589] trunk/blender/source/blender/nodes /composite/nodes/node_composite_sepcombHSVA.c: Fix #30405: combine HSVA node not working correct with fixed color instead

[Brecht Van Lommel]

Revision: 44589
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44589
Author:   blendix
Date:     2012-03-01 20:05:14 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Fix #30405: combine HSVA node not working correct with fixed color instead
of socket connected as input, patch by Denis Declara.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c	2012-03-01 19:19:10 UTC (rev 44588)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c	2012-03-01 20:05:14 UTC (rev 44589)
@@ -141,11 +141,10 @@
 	/* stack order out: 1 rgba channels */
 	/* stack order in: 4 value channels */
 
-	/* input no image? then only color operation */
+	/* input no image? then only color operation in HSV */
 	if((in[0]->data==NULL) && (in[1]->data==NULL) && (in[2]->data==NULL) && (in[3]->data==NULL)) {
-		out[0]->vec[0] = in[0]->vec[0];
-		out[0]->vec[1] = in[1]->vec[0];
-		out[0]->vec[2] = in[2]->vec[0];
+		hsv_to_rgb(in[0]->vec[0], in[1]->vec[0], in[2]->vec[0],
+		&out[0]->vec[0], &out[0]->vec[1], &out[0]->vec[2]);
 		out[0]->vec[3] = in[3]->vec[0];
 	}
 	else {