diff options
| author | Jacques Lucke <mail@jlucke.com> | 2019-05-16 15:11:11 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-05-16 15:11:11 +0300 |
| commit | db5120603f8f6236d1417199f257e35e0eb8c00b (patch) | |
| tree | b2c55dedaf2b49ac8abd4f50878bcf374e71cccb /source/blender/blenkernel/intern/object.c | |
| parent | c0d743238d022e12872549176257db8b9d602e3d (diff) | |
Refactor: Simplify ID Property freeing
This also makes `IDP_CopyProperty` the "opposite"
of `IDP_FreeProperty`, which is what I'd expect.
Two refactoring steps:
* rename IDP_FreeProperty to IDP_FreePropertyContent
* new IDP_FreeProperty function that actually frees the property
Reviewers: brecht
Differential Revision: https://developer.blender.org/D4872
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 6c2bd5e6127..78f2b10305e 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1951,7 +1951,6 @@ void BKE_object_make_proxy(Main *bmain, Object *ob, Object *target, Object *cob) /* copy IDProperties */ if (ob->id.properties) { IDP_FreeProperty(ob->id.properties); - MEM_freeN(ob->id.properties); ob->id.properties = NULL; } if (target->id.properties) { @@ -4497,4 +4496,4 @@ void BKE_object_update_select_id(struct Main *bmain) ob->runtime.select_id = select_id++; ob = ob->id.next; } -}
\ No newline at end of file +} |