diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-05-18 06:39:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-05-18 06:39:39 +0300 |
| commit | 52e53d61f5e64d28910927807ac11c4e6528da14 (patch) | |
| tree | 98f2a68180bcb8973319796d8c54d49130fc2bb1 /source/blender/blenkernel/intern/object.c | |
| parent | 8057b985727d4aabeb5c14143fcd9ef9088fbc00 (diff) | |
| parent | dfb963c70df515213c452094c20c83720bc017ee (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 1eff5c3a735..109037bc95a 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2289,7 +2289,7 @@ Object *BKE_object_add_for_data( void BKE_object_copy_softbody(Object *ob_dst, const Object *ob_src, const int flag) { SoftBody *sb = ob_src->soft; - bool tagged_no_main = ob_dst->id.tag & LIB_TAG_NO_MAIN; + const bool is_orig = (flag & LIB_ID_COPY_SET_COPIED_ON_WRITE) == 0; ob_dst->softflag = ob_src->softflag; if (sb == NULL) { @@ -2330,7 +2330,7 @@ void BKE_object_copy_softbody(Object *ob_dst, const Object *ob_src, const int fl sbn->scratch = NULL; - if (!tagged_no_main) { + if (is_orig) { sbn->shared = MEM_dupallocN(sb->shared); sbn->shared->pointcache = BKE_ptcache_copy_list( &sbn->shared->ptcaches, &sb->shared->ptcaches, flag); |