Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-07-28 05:00:58 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-07-28 05:00:58 +0300
commit251349c3c2269fff915d1bb85911211563493071 (patch)
tree35524bdb77d583562227ee11b1ff516ea278e00e /source/blender/blenkernel/intern/group.c
parentb1532493c27b08444745cef348641f3a0e899ba8 (diff)
parenta27acefd0c89aab63a6c243a844e2790dfad961a (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/group.c')
-rw-r--r--source/blender/blenkernel/intern/group.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index aae1ba241e7..708472fa4a5 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -96,10 +96,7 @@ Group *BKE_group_copy(Main *bmain, Group *group)
/* Do not copy group's preview (same behavior as for objects). */
groupn->preview = NULL;
- if (ID_IS_LINKED_DATABLOCK(group)) {
- BKE_id_expand_local(&groupn->id);
- BKE_id_lib_local_paths(bmain, group->id.lib, &groupn->id);
- }
+ BKE_id_copy_ensure_local(bmain, &group->id, &groupn->id);
return groupn;
}