Merge branch 'master' into blender2.8
[blender.git] / source / blender / nodes / shader / node_shader_tree.c
index fcb2198..9d77d45 100644 (file)
@@ -153,7 +153,7 @@ static void local_sync(bNodeTree *localtree, bNodeTree *ntree)
        BKE_node_preview_sync_tree(ntree, localtree);
 }
 
-static void local_merge(bNodeTree *localtree, bNodeTree *ntree)
+static void local_merge(Main *UNUSED(bmain), bNodeTree *localtree, bNodeTree *ntree)
 {
        BKE_node_preview_merge_tree(ntree, localtree, true);
 }