diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-11-12 17:59:01 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-11-12 17:59:01 +0300 |
| commit | 0b23f03503e6acb5261711720950fde410bb534d (patch) | |
| tree | 374f43634168e7e79cb1867ea25d914a9e53a14b /source/blender/editors | |
| parent | 3c4b1c0d60e1391bbcd95fb0e7f6d179cc1a33da (diff) | |
Bugfix #24335
ZCombine node in compositor ignored alpha values. Enabling it
would break compatibility though, so it's a tickbox option now.
Patch provided by reporter, Martin Lubich. Thanks!
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 62936059609..85c1daf81b3 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -776,6 +776,15 @@ static void node_composit_buts_alphaover(uiLayout *layout, bContext *UNUSED(C), uiItemR(col, ptr, "premul", 0, NULL, 0); } +static void node_composit_buts_zcombine(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +{ + uiLayout *col; + + col =uiLayoutColumn(layout, 1); + uiItemR(col, ptr, "use_alpha", 0, NULL, 0); +} + + static void node_composit_buts_hue_sat(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { uiLayout *col; @@ -1149,6 +1158,9 @@ static void node_composit_set_butfunc(bNodeType *ntype) case CMP_NODE_HUECORRECT: ntype->uifunc=node_composit_buts_huecorrect; break; + case CMP_NODE_ZCOMBINE: + ntype->uifunc=node_composit_buts_zcombine; + break; default: ntype->uifunc= NULL; } |