forked from bartvdbraak/blender
Two more fixes for pass composite:
- Blur nodes didn't accept RGB buffers (only RGBA or single channel ones) - Mix node had maximum for 'mix' on 1.0, for passes edit that could become more, made it 5!
This commit is contained in:
parent
2c816da097
commit
78d3f7358b
@ -1603,7 +1603,7 @@ static bNodeType cmp_node_hue_sat= {
|
|||||||
|
|
||||||
/* **************** MIX RGB ******************** */
|
/* **************** MIX RGB ******************** */
|
||||||
static bNodeSocketType cmp_node_mix_rgb_in[]= {
|
static bNodeSocketType cmp_node_mix_rgb_in[]= {
|
||||||
{ SOCK_VALUE, 1, "Fac", 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
|
{ SOCK_VALUE, 1, "Fac", 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f},
|
||||||
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
|
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
|
||||||
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
|
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
|
||||||
{ -1, 0, "" }
|
{ -1, 0, "" }
|
||||||
@ -2983,9 +2983,13 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
|
|||||||
{
|
{
|
||||||
CompBuf *new, *img= in[0]->data;
|
CompBuf *new, *img= in[0]->data;
|
||||||
|
|
||||||
if(img==NULL || img->type==CB_VEC3 || out[0]->hasoutput==0)
|
if(img==NULL || out[0]->hasoutput==0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if(img->type==CB_VEC3) {
|
||||||
|
img= typecheck_compbuf(in[0]->data, CB_RGBA);
|
||||||
|
}
|
||||||
|
|
||||||
/* if fac input, we do it different */
|
/* if fac input, we do it different */
|
||||||
if(in[1]->data) {
|
if(in[1]->data) {
|
||||||
|
|
||||||
@ -3028,6 +3032,8 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
|
|||||||
}
|
}
|
||||||
out[0]->data= new;
|
out[0]->data= new;
|
||||||
}
|
}
|
||||||
|
if(img!=in[0]->data)
|
||||||
|
free_compbuf(img);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user