diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
| commit | 8a6604f253e22bbade3dcf60b9a1c437ace44151 (patch) | |
| tree | fee875d0a0b09fbe0df52aa83094159144048205 /source/blender/blenkernel/intern/idprop.c | |
| parent | edf1b833674a6e54df7a16c14f0c6193fbbb482e (diff) | |
| parent | afec66c024dc2b75447537d45406c06342ec201e (diff) | |
Merge branch 'master' into temp-gpencil-maskingtemp-gpencil-masking
Conflicts:
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 6b164e6bc50..58715ac2e05 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -503,7 +503,7 @@ void IDP_SyncGroupValues(IDProperty *dest, const IDProperty *src) void IDP_SyncGroupTypes(IDProperty *dest, const IDProperty *src, const bool do_arraylen) { - LISTBASE_FOREACH_MUTABLE (IDProperty *, prop_dst, &src->data.group) { + LISTBASE_FOREACH_MUTABLE (IDProperty *, prop_dst, &dest->data.group) { const IDProperty *prop_src = IDP_GetPropertyFromGroup((IDProperty *)src, prop_dst->name); if (prop_src != NULL) { /* check of we should replace? */ |