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>2019-02-07 12:08:01 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-02-07 13:55:07 +0300
commit9c68ac0448b69b9d05380dc8665fb1f6a28f2edf (patch)
tree9f1f89343017460d40b2f71f6612c10fe22708b9 /source/blender/blenkernel/intern/image.c
parent0885484aa60336f601c0ea8042f82172198ec7ef (diff)
Show all useful metadata fields in editors
Is available when doing "View -> Show Metadata". Will draw all the fields which are not part of the stamp at the bottom of the image. Couple of hand-picked fields are ignored, since those are not very useful to be seen. Aimed to ease review of rendered shots. Reviewers: brecht Reviewed By: brecht Subscribers: fsiddi Differential Revision: https://developer.blender.org/D4316
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r--source/blender/blenkernel/intern/image.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 5428c921042..fe99863827e 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2112,6 +2112,20 @@ static const char *stamp_metadata_fields[] = {
NULL
};
+/* Check whether the given metadata field name translates to a known field of
+ * a stamp. */
+bool BKE_stamp_is_known_field(const char *field_name)
+{
+ int i = 0;
+ while (stamp_metadata_fields[i] != NULL) {
+ if (STREQ(field_name, stamp_metadata_fields[i])) {
+ return true;
+ }
+ i++;
+ }
+ return false;
+}
+
void BKE_stamp_info_callback(void *data, struct StampData *stamp_data, StampCallback callback, bool noskip)
{
if ((callback == NULL) || (stamp_data == NULL)) {
@@ -2197,24 +2211,12 @@ void BKE_imbuf_stamp_info(RenderResult *rr, struct ImBuf *ibuf)
BKE_stamp_info_callback(ibuf, stamp_data, metadata_set_field, false);
}
-BLI_INLINE bool metadata_is_copyable(const char *field_name)
-{
- int i = 0;
- while (stamp_metadata_fields[i] != NULL) {
- if (STREQ(field_name, stamp_metadata_fields[i])) {
- return false;
- }
- i++;
- }
- return true;
-}
-
static void metadata_copy_custom_fields(
const char *field,
const char *value,
void *rr_v)
{
- if (!metadata_is_copyable(field)) {
+ if (BKE_stamp_is_known_field(field)) {
return;
}
RenderResult *rr = (RenderResult *)rr_v;