bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Two more fixes for pass composite:

Browse Source 
- 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:
Ton Roosendaal 2006-12-05 18:27:43 +00:00
parent 2c816da097
commit 78d3f7358b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/node_composite.c
View File

@ -1603,7 +1603,7 @@ static bNodeType cmp_node_hue_sat= {
/* **************** MIX RGB ******************** */
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},
{ -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;
if(img==NULL || img->type==CB_VEC3 || out[0]->hasoutput==0)
if(img==NULL || out[0]->hasoutput==0)
return;
if(img->type==CB_VEC3) {
img= typecheck_compbuf(in[0]->data, CB_RGBA);
}
/* if fac input, we do it different */
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;
}
if(img!=in[0]->data)
free_compbuf(img);
}