diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-07 19:21:25 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-07 19:21:25 +0400 |
| commit | 6dec5db1e6e050067ee58d6db7a476b8153a5d0d (patch) | |
| tree | b6a2e05ba5d54b7fc64956dee89a1f46932ca9ff /source/blender/nodes/intern/CMP_util.h | |
| parent | 77639a5cdeea0f9718acf205ab300645add02969 (diff) | |
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).
Diffstat (limited to 'source/blender/nodes/intern/CMP_util.h')
| -rw-r--r-- | source/blender/nodes/intern/CMP_util.h | 2 |
1 files changed, 2 insertions, 0 deletions
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); /* **************************************************** */ |