From 331559d5859644d1ef0e7ce04a7aefd73ff47452 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 18 Feb 2008 15:21:59 +0000 Subject: Bugfix for defocus node gamma correct. It applied gamma correct to a premul image but that doesn't work correct. Now it depremuls and premuls again around the gamma correction. Better solution might be possible, but this gives compatible results. --- source/blender/nodes/intern/CMP_util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/nodes/intern/CMP_util.h') diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index 7cb10b75f3a..6fa5251710a 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -176,6 +176,7 @@ void do_hsva_to_rgba(bNode *node, float *out, float *in); void do_ycca_to_rgba(bNode *node, float *out, float *in); void gamma_correct_compbuf(CompBuf *img, int inversed); +void premul_compbuf(CompBuf *img, int inversed); void convolve(CompBuf* dst, CompBuf* in1, CompBuf* in2); extern void node_ID_title_cb(void *node_v, void *unused_v); -- cgit v1.2.3 From d7ef04a51939c49c32c0d82b0c53bd71788e760f Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 8 Mar 2008 19:02:08 +0000 Subject: Long on the wishlist, quite simple even, and there it finally is: Compositor: Muting option to temporary disable/enable nodes. Hotkey: press M on selection. It toggles. Note: no menu entry yet, and drawing style could be tweakered... --- source/blender/nodes/intern/CMP_util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/nodes/intern/CMP_util.h') diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index 6fa5251710a..a0e2f90f0da 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -132,6 +132,7 @@ CompBuf *dupalloc_compbuf(CompBuf *cbuf); CompBuf *pass_on_compbuf(CompBuf *cbuf); void free_compbuf(CompBuf *cbuf); void print_compbuf(char *str, CompBuf *cbuf); +void node_compo_pass_on(struct bNode *node, struct bNodeStack **nsin, struct bNodeStack **nsout); CompBuf *get_cropped_compbuf(rcti *drect, float *rectf, int rectx, int recty, int type); CompBuf *scalefast_compbuf(CompBuf *inbuf, int newx, int newy); -- cgit v1.2.3 From e6252661627407c8ed1004856ccfc67d32cf825d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 13 Mar 2008 11:26:18 +0000 Subject: Fix for bug #8385: vector inputs of texture node in the compositor did not work correct, it should use bNodeStack inputs like other nodes. --- source/blender/nodes/intern/CMP_util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/nodes/intern/CMP_util.h') diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index a0e2f90f0da..0d7bda0604c 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -107,6 +107,7 @@ typedef struct CompBuf { int xof, yof; /* relative to center of target image */ void (*rect_procedural)(struct CompBuf *, float *, float, float); + float procedural_size[3], procedural_offset[3]; bNode *node; /* only in use for procedural bufs */ struct CompBuf *next, *prev; /* for pass-on, works nicer than reference counting */ -- cgit v1.2.3 From 6dec5db1e6e050067ee58d6db7a476b8153a5d0d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 7 Apr 2008 15:21:25 +0000 Subject: Fix for bug #8073: texture nodes connected to a viewer could crash. Also fixed a bug where procedural buffers did not convert correctly to different buffer types (e.g. value -> rgba would give red). --- source/blender/nodes/intern/CMP_util.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/nodes/intern/CMP_util.h') diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index 0d7bda0604c..e111632a195 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -108,6 +108,7 @@ typedef struct CompBuf { void (*rect_procedural)(struct CompBuf *, float *, float, float); float procedural_size[3], procedural_offset[3]; + int procedural_type; bNode *node; /* only in use for procedural bufs */ struct CompBuf *next, *prev; /* for pass-on, works nicer than reference counting */ @@ -138,6 +139,7 @@ void node_compo_pass_on(struct bNode *node, struct bNodeStack **nsin, struct bNo CompBuf *get_cropped_compbuf(rcti *drect, float *rectf, int rectx, int recty, int type); CompBuf *scalefast_compbuf(CompBuf *inbuf, int newx, int newy); CompBuf *typecheck_compbuf(CompBuf *inbuf, int type); +void typecheck_compbuf_color(float *out, float *in, int outtype, int intype); float *compbuf_get_pixel(CompBuf *cbuf, float *rectf, int x, int y, int xrad, int yrad); /* **************************************************** */ -- cgit v1.2.3