diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-02-04 22:38:01 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-02-05 12:53:16 +0300 |
| commit | 8b716655e2152bb7558e00a5061f1381f9a9bd6e (patch) | |
| tree | b4bb135720d24b17107d311da83c38d98b4c8e83 /source/blender/blenkernel/intern/scene.c | |
| parent | 846105d254bf720dc8c1a0f1ffc892af7c25b06e (diff) | |
Cleanup: replace BKE_id_copy_ex by BKE_id_copy where possible.
That way it is obvious when we are using default ID copy behaviour, and
when we are using advanced/specialized ones.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index b8992d00774..a06c6743de8 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -399,8 +399,8 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) for (FreestyleLineSet *lineset = view_layer_dst->freestyle_config.linesets.first; lineset; lineset = lineset->next) { if (lineset->linestyle) { id_us_min(&lineset->linestyle->id); - /* XXX Not copying anim/actions here? */ - BKE_id_copy_ex(bmain, (ID *)lineset->linestyle, (ID **)&lineset->linestyle, 0); + /* XXX Not copying actions here? */ + BKE_id_copy(bmain, (ID *)lineset->linestyle, (ID **)&lineset->linestyle); } } } @@ -415,10 +415,10 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) BKE_collection_copy_full(bmain, sce_copy->master_collection); /* Full copy of GreasePencil. */ - /* XXX Not copying anim/actions here? */ + /* XXX Not copying actions here? */ if (sce_copy->gpd) { id_us_min(&sce_copy->gpd->id); - BKE_id_copy_ex(bmain, (ID *)sce_copy->gpd, (ID **)&sce_copy->gpd, 0); + BKE_id_copy(bmain, (ID *)sce_copy->gpd, (ID **)&sce_copy->gpd); } } else { |