diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-04-02 17:15:17 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-04-02 17:21:55 +0300 |
| commit | 0554b2e177e95cf0560a7e4ea969fad647eb4a5f (patch) | |
| tree | fac4e93b4ba6ef0ae570c95ebea96670b320d32e /source/blender/blenkernel/intern/scene.c | |
| parent | d986b04bd3021df107667c7cf74b31a27dbc443a (diff) | |
Fix T62970: Scene Copy: remove 'linked objects/obdata', add 'linked collections'.
'Linked objects' option was not behaving correctly before, effectively
linking in collections, so this one has been renamed to just 'Linked Copy',
and gives a fully shallow copy of current scene.
'Linked Obdata' was not really useful, kind of confusing, and was
painful to maintain, so dropping it now.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 50216d2e69a..f33939f0a3f 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -431,12 +431,12 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) BKE_sequencer_editing_free(sce_copy, true); } - /* NOTE: part of SCE_COPY_LINK_DATA and SCE_COPY_FULL operations + /* NOTE: part of SCE_COPY_FULL operations * are done outside of blenkernel with ED_object_single_users! */ /* camera */ /* XXX This is most certainly useless? Object have not yet been duplicated... */ - if (ELEM(type, SCE_COPY_LINK_DATA, SCE_COPY_FULL)) { + if (type == SCE_COPY_FULL) { ID_NEW_REMAP(sce_copy->camera); } |