Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-03-04 13:29:55 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-03-04 13:32:30 +0300
commite90a2807bf2ba1f14ceaa7f062fafc94d7e81cbe (patch)
tree3fe55281eae0aff6915746c3ff03b6840c801bfa /source
parent2150a68a80892dfc9f9a8fe091532a3673b14cae (diff)
Show metadata for rendered images
Previously metadata was only shown for images which are saved to disk. This change makes it so that it's possible to see metadata right after pressing F12.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/image.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 2a04c81230e..38513f8b427 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3958,6 +3958,15 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_loc
ibuf->flags &= ~IB_zbuffloat;
}
+ /* TODO(sergey): Make this faster by either simply referencing the stamp
+ * or by changing both ImBug and RenderResult to use same data type to
+ * store metadata. */
+ if (ibuf->metadata != NULL) {
+ IMB_metadata_free(ibuf->metadata);
+ ibuf->metadata = NULL;
+ }
+ BKE_imbuf_stamp_info(&rres, ibuf);
+
BLI_thread_unlock(LOCK_COLORMANAGE);
ibuf->dither = dither;