From 86c2c4d513f122da86524483f33182189aacf75a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 5 May 2018 09:31:17 +0200 Subject: IDProp API: Avoid redundant group replace lookup --- source/blender/blenkernel/intern/idprop.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/idprop.c') diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index a224ef1e212..5fb6dd558e0 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -579,10 +579,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); -- cgit v1.2.3