diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-08-29 17:34:17 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-08-29 19:11:12 +0300 |
| commit | b9c400cee2ea34fc1d1a03bf27938d56785a11a5 (patch) | |
| tree | 3e570ec9d3a2bd63bbbb13af520465b307b27831 /source/blender/blenkernel/intern/scene.c | |
| parent | f4307d4bd9cf166a4d5b1843e055d41868a5fb47 (diff) | |
BKE_libblock_relink_ex: pass all remapping flags instead of a single boolean.
There is no reasons to limit access to remapping flags here, we may want
to use other options than only the ID_REMAP_SKIP_NEVER_NULL_USAGE one...
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 1ef93427253..ef49c958d37 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -268,7 +268,11 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons /* Note: nodetree is *not* in bmain, however this specific case is handled at lower level * (see BKE_libblock_copy_ex()). */ BKE_id_copy_ex(bmain, (ID *)sce_src->nodetree, (ID **)&sce_dst->nodetree, flag); - BKE_libblock_relink_ex(bmain, sce_dst->nodetree, (void *)(&sce_src->id), &sce_dst->id, false); + BKE_libblock_relink_ex(bmain, + sce_dst->nodetree, + (void *)(&sce_src->id), + &sce_dst->id, + ID_REMAP_SKIP_NEVER_NULL_USAGE); } if (sce_src->rigidbody_world) { |