diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-25 21:55:49 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-25 21:55:49 +0300 |
commit | 98c90df56c1b53109e0fe490fd97bb5031766be6 (patch) | |
tree | 7ea939e368cae8ee44e7d4af53606fc5ba1016bd /source/blender/blenkernel/intern/image.c | |
parent | 753e73009f7886d61aa80ae0ec56e87dd203bfe7 (diff) | |
parent | 7e40a231a7c55a6745511221a74137317bd0aaec (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 5ab843e60c3..2a04c81230e 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2181,7 +2181,23 @@ void BKE_render_result_stamp_data(RenderResult *rr, const char *key, const char BLI_addtail(&stamp_data->custom_fields, field); } -void BKE_stamp_data_free(struct StampData *stamp_data) +StampData *BKE_stamp_data_copy(const StampData *stamp_data) +{ + if (stamp_data == NULL) { + return NULL; + } + + StampData *stamp_datan = MEM_dupallocN(stamp_data); + BLI_duplicatelist(&stamp_datan->custom_fields, &stamp_data->custom_fields); + + LISTBASE_FOREACH(StampDataCustomField *, custom_fieldn, &stamp_datan->custom_fields) { + custom_fieldn->value = MEM_dupallocN(custom_fieldn->value); + } + + return stamp_datan; +} + +void BKE_stamp_data_free(StampData *stamp_data) { if (stamp_data == NULL) { return; |