diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-11-19 15:16:14 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-11-19 15:16:14 +0300 |
| commit | 7f96323cd001bc7555d0f145027e3bbbbc1462b8 (patch) | |
| tree | 842a4ac4095be5c22bd0a505612c731351839a29 /source/blender/nodes | |
| parent | 4de142e0b7ba014a3e1e41672600aa38465f2454 (diff) | |
| parent | 3133d2d58c391544a48342860120336e2a0f944e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c index 006bd0cc8bb..8748c884a25 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c @@ -66,7 +66,7 @@ static void node_shader_free_tex_pointdensity(bNode *node) MEM_freeN(point_density); } -static void node_shader_copy_tex_pointdensity(bNodeTree * UNUSED(dest_ntree), +static void node_shader_copy_tex_pointdensity(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bNode *src_node) { |