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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-01 18:09:21 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-01 18:11:24 +0300
commitcb9f9a63e02986bd308dcd4b39ea19586b233167 (patch)
tree1e3864b3f398ac74c538cee61630af0e8385cb40 /source/blender/blenkernel/BKE_image.h
parentd7af7a1e04c243170edffeda3f2feb19605d2aba (diff)
Fix wrong information used for stamp when "Strip Metadata" is used
Such configuration used to cause quite confusing situation when stamp will use actual scene's statistics but metadata from strip will be used for the saved file (basically, causing different information stamped and saved as metadata). Don't think it was desired behavior and it's something what artists here in the studio wants to be fixed.
Diffstat (limited to 'source/blender/blenkernel/BKE_image.h')
-rw-r--r--source/blender/blenkernel/BKE_image.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index aec5b0afa45..894ccae0dc8 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -68,7 +68,7 @@ void BKE_imbuf_stamp_info(struct RenderResult *rr, struct ImBuf *ibuf);
void BKE_stamp_info_from_imbuf(struct RenderResult *rr, struct ImBuf *ibuf);
void BKE_stamp_info_callback(void *data, struct StampData *stamp_data, StampCallback callback, bool noskip);
void BKE_image_stamp_buf(
- struct Scene *scene, struct Object *camera,
+ struct Scene *scene, struct Object *camera, const struct StampData *stamp_data_template,
unsigned char *rect, float *rectf, int width, int height, int channels);
bool BKE_imbuf_alpha_test(struct ImBuf *ibuf);
int BKE_imbuf_write_stamp(