diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 17:02:46 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 17:02:46 +0300 |
commit | 204c167c72fe20448200dc0a1504a84762ffd926 (patch) | |
tree | 5f0adb8c5de4f8a0dd6406eabaa65fd36e3ff5ca /source/blender/blenkernel/intern/node.c | |
parent | 9e439197edcdae1ec9445524bd85bed85249f497 (diff) | |
parent | 78a8d3685bd3487eb0b5dd55793f94fe7235e377 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_convert.c
source/blender/editors/interface/interface_eyedropper_color.c
source/blender/editors/object/object_add.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_image.c
source/blender/windowmanager/intern/wm_draw.c
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index bf25306028f..72a34d35715 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2050,11 +2050,11 @@ void ntreeLocalSync(bNodeTree *localtree, bNodeTree *ntree) /* merge local tree results back, and free local tree */ /* we have to assume the editor already changed completely */ -void ntreeLocalMerge(bNodeTree *localtree, bNodeTree *ntree) +void ntreeLocalMerge(Main *bmain, bNodeTree *localtree, bNodeTree *ntree) { if (ntree && localtree) { if (ntree->typeinfo->local_merge) - ntree->typeinfo->local_merge(localtree, ntree); + ntree->typeinfo->local_merge(bmain, localtree, ntree); ntreeFreeTree(localtree); MEM_freeN(localtree); |