diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-05 10:57:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-05 10:57:45 +0300 |
| commit | f91e9529dacb21ef709e7fd1ef8f989731a5a2f3 (patch) | |
| tree | 4156f2a01563a526a116297966cda041afa98643 /source/blender/blenkernel/intern/idprop.c | |
| parent | 3b0475bc6407d37329b729f6125edbac23404dd7 (diff) | |
| parent | d83681807e1ef39228620d10fee22003d753a050 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index b3b5afa88a9..1e7f6cf284a 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -580,10 +580,9 @@ void IDP_ReplaceGroupInGroup(IDProperty *dest, const IDProperty *src) void IDP_ReplaceInGroup_ex(IDProperty *group, IDProperty *prop, IDProperty *prop_exist) { BLI_assert(group->type == IDP_GROUP); - BLI_assert(prop_exist == IDP_GetPropertyFromGroup(group, prop->name)); - if ((prop_exist = IDP_GetPropertyFromGroup(group, prop->name))) { + if (prop_exist != NULL) { BLI_insertlinkreplace(&group->data.group, prop_exist, prop); IDP_FreeProperty(prop_exist); MEM_freeN(prop_exist); |