diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-02 00:05:14 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-02 00:05:14 +0400 |
commit | d534f0e16dfdf3ed2a3360ad9f317a258cd8cc8e (patch) | |
tree | dd1669fce416fd06ebfbc5bb07d0827b152afba5 /source/blender | |
parent | 8643b8a02d09ac60c9b0f5d15b57a580bb1cb1e7 (diff) |
Fix #30405: combine HSVA node not working correct with fixed color instead
of socket connected as input, patch by Denis Declara.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c index d742a916fdf..cde54cfd132 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c +++ b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c @@ -141,11 +141,10 @@ static void node_composit_exec_combhsva(void *UNUSED(data), bNode *node, bNodeSt /* 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 { |