diff options
| author | Omar Emara <mail@OmarEmara.dev> | 2021-11-19 16:58:37 +0300 |
|---|---|---|
| committer | Omar Emara <mail@OmarEmara.dev> | 2021-11-19 16:58:37 +0300 |
| commit | 0852805ed771043f43752658bb763983a8aae408 (patch) | |
| tree | 8d77c8a13cd783c4932c8a937176209e92ad551f /source/blender/blenkernel/intern/constraint.c | |
| parent | 06691d1b21fe06c86876c78e45ca75cb1aa048ae (diff) | |
| parent | a20e703d1a5cc0d3e4294825e31609d9b92da06d (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index beaf2f2be9a..3455baa9292 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -6022,7 +6022,6 @@ bConstraint *BKE_constraint_duplicate_ex(bConstraint *src, const int flag, const bConstraint *dst = MEM_dupallocN(src); constraint_copy_data_ex(dst, src, flag, do_extern); dst->next = dst->prev = NULL; - dst->flag |= CONSTRAINT_OVERRIDE_LIBRARY_LOCAL; return dst; } @@ -6057,7 +6056,9 @@ void BKE_constraints_copy_ex(ListBase *dst, const ListBase *src, const int flag, for (con = dst->first, srccon = src->first; con && srccon; srccon = srccon->next, con = con->next) { constraint_copy_data_ex(con, srccon, flag, do_extern); - con->flag |= CONSTRAINT_OVERRIDE_LIBRARY_LOCAL; + if ((flag & LIB_ID_COPY_NO_LIB_OVERRIDE_LOCAL_DATA_FLAG) == 0) { + con->flag |= CONSTRAINT_OVERRIDE_LIBRARY_LOCAL; + } } } |