diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2022-10-30 00:41:21 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2022-10-30 01:14:59 +0300 |
| commit | bc37e8d8399eef686b71341aa90eced9bc117786 (patch) | |
| tree | 92e4af388150209df9bc44e2cba6f2f303aa7baf /source/blender/nodes/shader/nodes/node_shader_add_shader.cc | |
| parent | 552abb838c76d44a0d7d1226b59a1ab381e88386 (diff) | |
| parent | d1d2f002c7caaf4ab457ec27bbc44666d7aac624 (diff) | |
Merge remote-tracking branch 'origin/master' into principled-v2
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_add_shader.cc')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_add_shader.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_add_shader.cc b/source/blender/nodes/shader/nodes/node_shader_add_shader.cc index 330bdc0ba61..f7b25225e30 100644 --- a/source/blender/nodes/shader/nodes/node_shader_add_shader.cc +++ b/source/blender/nodes/shader/nodes/node_shader_add_shader.cc @@ -14,7 +14,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_add_shader(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { |