diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
| commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
| tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /source/blender/nodes/composite/nodes/node_composite_zcombine.cc | |
| parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
| parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) | |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'source/blender/nodes/composite/nodes/node_composite_zcombine.cc')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_zcombine.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc index e5f460099e9..c1d9442e9ad 100644 --- a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc +++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc @@ -26,7 +26,7 @@ static void cmp_node_zcombine_declare(NodeDeclarationBuilder &b) b.add_output<decl::Float>(N_("Z")); } -static void node_composit_buts_zcombine(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_zcombine(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; |