diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
| commit | dfe2f8dc03267e041102837e92f547fb04881510 (patch) | |
| tree | d9582c4667ce5b9e39e2adce40832aa4f44b4fe7 /source/blender/nodes/intern/CMP_util.c | |
| parent | d7e08f2d33207fdf76b1b597ef0de9dec26e3987 (diff) | |
| parent | 00e46ef739cf2bfddb8805af056aa59fd3b3c71c (diff) | |
Merged changes in the trunk up to revision 28247.
Diffstat (limited to 'source/blender/nodes/intern/CMP_util.c')
| -rw-r--r-- | source/blender/nodes/intern/CMP_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/CMP_util.c b/source/blender/nodes/intern/CMP_util.c index f66b13a1937..f3e00cb37f8 100644 --- a/source/blender/nodes/intern/CMP_util.c +++ b/source/blender/nodes/intern/CMP_util.c @@ -578,9 +578,9 @@ CompBuf *valbuf_from_rgbabuf(CompBuf *cbuf, int channel) valbuf->yof= cbuf->yof; valf= valbuf->rect; - + /* defaults to returning alpha channel */ - if ((channel < CHAN_R) && (channel > CHAN_A)) channel = CHAN_A; + if ((channel < CHAN_R) || (channel > CHAN_A)) channel = CHAN_A; rectf= cbuf->rect + channel; |