diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-03-18 23:28:04 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-03-21 18:38:13 +0300 |
| commit | 8530e48f8692f4b92c43489029f2d2ef67c7cb62 (patch) | |
| tree | d335479baf037b897ddf14f42c238184f65d0472 /source/blender/blenkernel/intern/image.cc | |
| parent | b96462519f748fcf04028084354fbbf97eb8ce92 (diff) | |
Cleanup: move render image and multilayer EXR write code to image_save.cc
These share a lot of logic with regular image saving and should be unified
more in the future.
Diffstat (limited to 'source/blender/blenkernel/intern/image.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/image.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index 51ffd3338c4..f8fb2ec7e45 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -2343,9 +2343,9 @@ static void metadata_get_field(void *data, const char *propname, char *propvalue IMB_metadata_get_field(imbuf->metadata, propname, propvalue, len); } -void BKE_imbuf_stamp_info(RenderResult *rr, struct ImBuf *ibuf) +void BKE_imbuf_stamp_info(const RenderResult *rr, ImBuf *ibuf) { - struct StampData *stamp_data = rr->stamp_data; + StampData *stamp_data = const_cast<StampData *>(rr->stamp_data); IMB_metadata_ensure(&ibuf->metadata); BKE_stamp_info_callback(ibuf, stamp_data, metadata_set_field, false); } @@ -2359,12 +2359,12 @@ static void metadata_copy_custom_fields(const char *field, const char *value, vo BKE_render_result_stamp_data(rr, field, value); } -void BKE_stamp_info_from_imbuf(RenderResult *rr, struct ImBuf *ibuf) +void BKE_stamp_info_from_imbuf(RenderResult *rr, ImBuf *ibuf) { if (rr->stamp_data == nullptr) { rr->stamp_data = MEM_cnew<StampData>("RenderResult.stamp_data"); } - struct StampData *stamp_data = rr->stamp_data; + StampData *stamp_data = rr->stamp_data; IMB_metadata_ensure(&ibuf->metadata); BKE_stamp_info_callback(ibuf, stamp_data, metadata_get_field, true); /* Copy render engine specific settings. */ @@ -2428,8 +2428,8 @@ int BKE_imbuf_write_as(ImBuf *ibuf, const char *name, ImageFormatData *imf, cons return ok; } -int BKE_imbuf_write_stamp(Scene *scene, - struct RenderResult *rr, +int BKE_imbuf_write_stamp(const Scene *scene, + const struct RenderResult *rr, ImBuf *ibuf, const char *name, const struct ImageFormatData *imf) |